--- gforth/etags.fs	1995/11/07 18:06:39	1.3
+++ gforth/etags.fs	1997/12/01 21:37:39	1.8
@@ -37,6 +37,9 @@
 \ header, NAME>STRING must convert that pointer to a string, and
 \ HEADER must be a deferred word that is called to create the name.
 
+require search.fs
+require extend.fs
+
 : tags-file-name ( -- c-addr u )
     \ for now I use just TAGS; this may become more flexible in the
     \ future
@@ -64,21 +67,15 @@ create tags-line 128 chars allot
     endif
     tags-file @ ;
 
-create emit-file-char 0 c,
-
-: emit-file ( c file-id -- )
-    swap emit-file-char c!
-    emit-file-char 1 chars rot write-file ;
-
 2variable last-loadfilename 0 0 last-loadfilename 2!
 
 : put-load-file-name ( file-id -- )
     >r
-    loadfilename 2@ last-loadfilename 2@ d<>
+    sourcefilename last-loadfilename 2@ d<>
     if
 	#ff r@ emit-file throw
 	#lf r@ emit-file throw
-	loadfilename 2@ 2dup
+	sourcefilename 2dup
 	r@ write-file throw
 	last-loadfilename 2!
 	s" ,0" r@ write-line throw
@@ -89,7 +86,7 @@ create emit-file-char 0 c,
     \ write the entry for the last name to the TAGS file
     \ if the input is from a file and it is not a local name
     source-id dup 0<> swap -1 <> and	\ input from a file
-    get-current locals-list <> and	\ not a local name
+    current @ locals-list <> and	\ not a local name
     last @ 0<> and	\ not an anonymous (i.e. noname) header
     if
 	tags-file-id >r 
@@ -100,13 +97,13 @@ create emit-file-char 0 c,
 	last @ name>string r@ write-file throw
 	bl r@ emit-file throw
 	1 r@ emit-file throw
-	base @ decimal loadline @ 0 <# #s #> r@ write-file throw base !
+	base @ decimal sourceline# 0 <# #s #> r@ write-file throw base !
 	s" ,0" r@ write-line throw
 	\ the character position in the file; not strictly necessary AFAIK
 	\ instead of using 0, we could use file-position and subtract
 	\ the line length
 	rdrop
-    endif cr ;
+    endif ;
 
 : (tags-header) ( -- )
     defers header