--- gforth/cross.fs	1995/11/07 18:06:35	1.30
+++ gforth/cross.fs	1995/12/23 16:21:56	1.33
@@ -405,7 +405,7 @@ Variable to-doc
 
 \ Target TAGS creation
 
-s" TAGS" r/w create-file throw value tag-file-id
+s" kernal.TAGS" r/w create-file throw value tag-file-id
 \ contains the file-id of the tags file
 
 Create tag-beg 2 c,  7F c, bl c,
@@ -418,7 +418,7 @@ Create tag-bof 1 c,  0C c,
     loadfilename 2@ last-loadfilename 2@ d<>
     IF
 	tag-bof count tag-file-id write-line throw
-	loadfilename 2@ 2dup
+	sourcefilename 2dup
 	tag-file-id write-file throw
 	last-loadfilename 2!
 	s" ,0" tag-file-id write-line throw
@@ -432,7 +432,7 @@ Create tag-bof 1 c,  0C c,
 	tag-beg count tag-file-id write-file throw
 	tlast @ >image count $1F and tag-file-id write-file throw
 	tag-end count tag-file-id write-file throw
-	base @ decimal loadline @ 0 <# #s #> tag-file-id write-file throw
+	base @ decimal sourceline# 0 <# #s #> tag-file-id write-file throw
 \	>in @ 0 <# #s [char] , hold #> tag-file-id write-line throw
 	s" ,0" tag-file-id write-line throw
 	base !
@@ -694,6 +694,10 @@ Build: T 0 , H ;
 by Constant
 Builder Value
 
+Build: T 0 A, H ;
+by Constant
+Builder AValue
+
 Build:  ( -- ) compile noop ;
 DO: ( ghost -- ) ABORT" CROSS: Don't execute" ;DO
 Builder Defer