--- gforth/tags.fs	2003/03/09 15:16:56	1.3
+++ gforth/tags.fs	2012/12/31 15:25:18	1.15
@@ -1,12 +1,12 @@
 \ VI tags support for GNU Forth.
 
-\ Copyright (C) 1995,1998,2002 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998,2002,2003,2007,2008,2009,2010,2012 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 \ usage: gforth tags.fs your_files.fs ...
 \  then: vi -t word_name
@@ -35,7 +34,7 @@
 \ (e.g. via shared memory)
 
 \ This is ANS Forth with the following serious environmental
-\ dependences: the variable LAST must contain a pointer to the last
+\ dependences: the word LATEST must return a pointer to the last
 \ header, NAME>STRING must convert that pointer to a string, and
 \ HEADER must be a deferred word that is called to create the name.
 
@@ -49,7 +48,7 @@
 \ to comment out search.fs since it sets the search order destructively
 \ on my system.  Added a bit more explanation on how to use tags.fs.
 
-\ require search.fs
+require search.fs
 require extend.fs
 
 : tags-file-name ( -- c-addr u )
@@ -67,7 +66,8 @@ create tags-line 128 chars allot
 
 : tags-file-id ( -- file-id )
     tags-file @ 0= if
-	tags-file-name w/o create-file throw
+        s" sort >tags" w/o open-pipe throw
+\	tags-file-name w/o create-file throw
 \ 	2dup file-status
 \ 	if \ the file does not exist
 \ 	    drop w/o create-file throw
@@ -86,23 +86,34 @@ create tags-line 128 chars allot
     sourcefilename r@ write-file throw
     #tab r> emit-file throw ;
 
-: put-tags-entry ( -- )
-    \ 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
+: put-tags-string ( c-addr u -- )
+    2>r source-id dup 0<> swap -1 <> and	\ input from a file
     current @ locals-list <> and	\ not a local name
-    last @ 0<> and	\ not an anonymous (i.e. noname) header
     if
 	tags-file-id >r 
-	last @ name>string r@ write-file throw
+	r> 2r> rot dup >r write-file throw
 	#tab r@ emit-file throw
 	r@ put-load-file-name
 	s" /^" r@ write-file throw
 	source drop >in @ r@ write-file throw
 	s" /" r@ write-line throw
 	rdrop
+    else
+	2r> 2drop
     endif ;
 
+: put-tags-name ( -- )
+    >in @ parse-name put-tags-string >in ! ;
+
+' put-tags-name is record-name
+
+: put-tags-entry ( -- )
+    \ 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
+    latest 0<> if
+	latest name>string put-tags-string
+    then ;
+
 : (tags-header) ( -- )
     defers header
     put-tags-entry ;