--- gforth/extend.fs	1995/11/29 20:20:35	1.13
+++ gforth/extend.fs	1996/07/16 20:57:08	1.17
@@ -37,6 +37,8 @@ decimal
 : 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*
@@ -120,34 +122,62 @@ 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 sourceline# 0 min  THEN ;
 
 : save-input ( -- x1 .. xn n ) \ core-ext
-  >in @
-  loadfile @ ?dup
-  IF    dup file-position throw sourceline# >tib @ 6
-        #tib @ >tib +!
-  ELSE  sourceline# 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 sourceline# <> 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 ;
+
+\ : save-input ( -- x1 .. xn n ) \ core-ext
+\   >in @
+\   loadfile @ ?dup
+\   IF    dup file-position throw sourceline# >tib @ 6
+\         #tib @ >tib +!
+\   ELSE  sourceline# blk @ linestart @ >tib @ 5 THEN
+\ ;
+
+\ : 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 sourceline# <> IF 2drop true EXIT THEN
+\            loadline !
+\       THEN
+\   >in ! false ;
 
 
 
@@ -165,6 +195,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 ! ;