--- gforth/extend.fs	1997/05/29 19:42:13	1.24
+++ gforth/extend.fs	1998/12/08 22:02:41	1.30
@@ -1,6 +1,6 @@
 \ EXTEND.FS    CORE-EXT Word not fully tested!         12may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -73,29 +73,16 @@ decimal
 : C" ( compilation "...<quote>" -- ; run-time  -- c-addr ) \ core-ext c-quote
     [char] " parse postpone CLiteral ; immediate restrict
 
-\ UNUSED                                                17may93jaw
-
-: dictionary-end ( -- addr )
-    forthstart dup 3 cells + @ + ;
-
-: unused ( -- u ) \ core-ext
-    dictionary-end here - ;
-
 \ [COMPILE]                                             17may93jaw
 
 : [compile] ( compilation "name" -- ; run-time ? -- ? ) \ core-ext bracket-compile
     comp' drop compile, ; immediate
 
-\ MARKER                                                17may93jaw
-
-\ : marker here last @ create , , DOES> dup @ last ! cell+ @ dp ! ;
-\ doesn't work now. vocabularies?
-
 \ CONVERT                                               17may93jaw
 
 : convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext
-    \ obsolescent; superseded by @code{>number}.
-    true >number drop ;
+    \G obsolescent; superseded by @code{>number}.
+    char+ true >number drop ;
 
 \ ERASE                                                 17may93jaw
 
@@ -107,20 +94,18 @@ decimal
 
 \ SEARCH                                                02sep94py
 
-: search   ( buf buflen text textlen -- restbuf restlen flag ) \ string
-    2over  2 pick - 1+ 3 pick c@ >r
-    BEGIN
-	r@ scan dup
-    WHILE
-	>r >r  2dup r@ -text
-	0=
-	IF
-	    >r drop 2drop r> r> r> rot + 1- rdrop true
-	    EXIT
-	THEN
-	r> r>  1 /string
-    REPEAT
-    2drop 2drop  rdrop false ;
+: search ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 flag ) \ string
+    \ not very efficient; but if we want efficiency, we'll do it as primitive
+    2>r 2dup
+    begin
+	dup r@ >=
+    while
+	over 2r@ swap -text 0= if
+	    2swap 2drop 2r> 2drop true exit
+	endif
+	1 /string
+    repeat
+    2drop 2r> 2drop false ;
 
 \ SOURCE-ID SAVE-INPUT RESTORE-INPUT                    11jun93jaw
 
@@ -178,3 +163,47 @@ variable span ( -- a-addr ) \ core-ext
     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 !
+    \ clean up vocabulary stack
+    0 vp @ 0
+    ?DO
+	vp cell+ I cells + @ dup here >
+	IF  drop  ELSE  swap 1+  THEN
+    LOOP
+    dup 0= or set-order \ -1 set-order if order is empty
+    get-current here > IF
+	forth-wordlist set-current
+    THEN ;
+
+: marker ( "mark" -- )
+    marker, Create A,
+DOES> ( -- )
+    @ marker! ;
+