--- gforth/extend.fs	1997/06/23 16:57:02	1.26
+++ gforth/extend.fs	1997/07/31 16:17:09	1.28
@@ -78,11 +78,6 @@ decimal
 : [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
@@ -99,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
 
@@ -170,3 +163,37 @@ 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 ! ;
+
+: marker ( "mark" -- )
+    marker, Create A,
+DOES> ( -- )
+    @ marker! ;
+