--- gforth/extend.fs	1995/10/16 18:33:07	1.11
+++ gforth/extend.fs	1997/06/06 17:27:55	1.25
@@ -1,5 +1,24 @@
 \ EXTEND.FS    CORE-EXT Word not fully tested!         12may93jaw
 
+\ Copyright (C) 1995 Free Software Foundation, Inc.
+
+\ This file is part of Gforth.
+
+\ Gforth is free software; you can redistribute it and/or
+\ modify it under the terms of the GNU General Public License
+\ as published by the Free Software Foundation; either version 2
+\ of the License, or (at your option) any later version.
+
+\ This program is distributed in the hope that it will be useful,
+\ but WITHOUT ANY WARRANTY; without even the implied warranty of
+\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\ GNU General Public License for more details.
+
+\ You should have received a copy of the GNU General Public License
+\ along with this program; if not, write to the Free Software
+\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
 \ May be cross-compiled
 
 decimal
@@ -11,13 +30,13 @@ decimal
 
 \ VALUE 2>R 2R> 2R@                                     17may93jaw
 
-: value ( w -- ) \ core-ext
-  (constant) , ;
 \ !! 2value
 
 : 2Literal ( compilation w1 w2 -- ; run-time  -- w1 w2 ) \ double two-literal
     swap postpone Literal  postpone Literal ; immediate restrict
 
+' drop alias d>s ( d -- n ) \ double		d_to_s
+
 : m*/ ( d1 n2 u3 -- dqout ) \ double m-star-slash
     >r s>d >r abs -rot
     s>d r> xor r> swap >r >r dabs rot tuck um* 2swap um*
@@ -54,16 +73,10 @@ decimal
 : C" ( compilation "...<quote>" -- ; run-time  -- c-addr ) \ core-ext c-quote
     [char] " parse postpone CLiteral ; immediate restrict
 
-\ UNUSED                                                17may93jaw
-
-: unused ( -- u ) \ core-ext
-    s0 @ 512 -        \ for stack
-    here - ;
-
 \ [COMPILE]                                             17may93jaw
 
 : [compile] ( compilation "name" -- ; run-time ? -- ? ) \ core-ext bracket-compile
-    ' compile, ; immediate
+    comp' drop compile, ; immediate
 
 \ MARKER                                                17may93jaw
 
@@ -73,7 +86,7 @@ decimal
 \ CONVERT                                               17may93jaw
 
 : convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext
-    \ obsolescent; supersedet by @code{>number}.
+    \ obsolescent; superseded by @code{>number}.
     true >number drop ;
 
 \ ERASE                                                 17may93jaw
@@ -101,36 +114,44 @@ decimal
     REPEAT
     2drop 2drop  rdrop false ;
 
-\ ROLL                                                  17may93jaw
-
-: roll  ( x0 x1 .. xn n -- x1 .. xn x0 ) \ core-ext
-  dup 1+ pick >r
-  cells sp@ cell+ dup cell+ rot move drop r> ;
-
 \ SOURCE-ID SAVE-INPUT RESTORE-INPUT                    11jun93jaw
 
-: source-id ( -- 0 | -1 | fileid ) \ core-ext source-i-d
-  loadfile @ dup 0= IF  drop loadline @ 0 min  THEN ;
+: source-id ( -- 0 | -1 | fileid ) \ core-ext,file source-i-d
+  loadfile @ dup 0= IF  drop sourceline# 0 min  THEN ;
 
 : save-input ( -- x1 .. xn n ) \ core-ext
-  >in @
-  loadfile @ ?dup
-  IF    dup file-position throw loadline @ >tib @ 6
-        #tib @ >tib +!
-  ELSE  loadline @ blk @ linestart @ >tib @ 5 THEN
-;
+    >in @
+    loadfile @
+    if
+	loadfile @ file-position throw
+    else
+	blk @
+	linestart @
+    then
+    sourceline#
+    >tib @
+    source-id
+    6 ;
 
 : restore-input ( x1 .. xn n -- flag ) \ core-ext
-  swap >tib !
-  6 = IF   loadline ! rot dup loadfile !
-           reposition-file IF drop true EXIT THEN
-      ELSE linestart ! blk !
-           dup loadline @ <> IF 2drop true EXIT THEN
-           loadline !
-      THEN
-  >in ! false ;
-
-
+    6 <> -12 and throw
+    source-id <> -12 and throw
+    >tib !
+    >r ( line# )
+    loadfile @ 0<>
+    if
+	loadfile @ reposition-file throw
+    else
+	linestart !
+	blk !
+	sourceline# r@ <> blk @ 0= and loadfile @ 0= and
+	if
+	    drop rdrop true EXIT
+	then
+    then
+    r> loadline !
+    >in !
+    false ;
 
 \ This things we don't need, but for being complete... jaw
 
@@ -146,6 +167,6 @@ variable span ( -- a-addr ) \ core-ext
 	key decode ( maxlen span c-addr pos2 flag )
 	>r 2over = r> or
     UNTIL
-    type-rest drop
-    2drop nip span ! ;
+    2 pick swap /string type
+    nip span ! ;