--- gforth/extend.fs	1995/12/04 16:38:52	1.14
+++ gforth/extend.fs	1997/07/06 15:55:23	1.27
@@ -30,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*
@@ -73,27 +73,16 @@ 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
-
-\ MARKER                                                17may93jaw
-
-\ : marker here last @ create , , DOES> dup @ last ! cell+ @ dp ! ;
-\ doesn't work now. vocabularies?
+    comp' drop compile, ; immediate
 
 \ CONVERT                                               17may93jaw
 
 : convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext
-    \ obsolescent; supersedet by @code{>number}.
-    true >number drop ;
+    \G obsolescent; superseded by @code{>number}.
+    char+ true >number drop ;
 
 \ ERASE                                                 17may93jaw
 
@@ -120,15 +109,9 @@ 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
+: 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
@@ -165,26 +148,6 @@ decimal
     >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 ;
-
-
-
 \ This things we don't need, but for being complete... jaw
 
 \ EXPECT SPAN                                           17may93jaw
@@ -199,6 +162,40 @@ 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 ! ;
+
+\ marker                                               18dec94py
+
+\ Marker creates a mark that is removed (including everything 
+\ defined afterwards) when executing the mark.
+
+: marker, ( -- mark )  here dup A,
+  voclink @ A, voclink
+  BEGIN  @ dup WHILE  dup 0 wordlist-link - @ A,  REPEAT  drop
+  udp @ , ;
+
+: marker! ( mark -- )
+    dup @ swap cell+
+    dup @ voclink ! cell+
+    voclink
+    BEGIN
+	@ dup 
+    WHILE
+	over @ over 0 wordlist-link - !
+	swap cell+ swap
+    REPEAT
+    drop  voclink
+    BEGIN
+	@ dup
+    WHILE
+	dup 0 wordlist-link - rehash
+    REPEAT
+    drop
+    @ udp !  dp ! ;
+
+: marker ( "mark" -- )
+    marker, Create A,
+DOES> ( -- )
+    @ marker! ;