[openfirmware] [commit] r2841 - in forth: kernel lib

[repository service]

Author: wmb
Date: Mon Jan 23 18:55:59 2012
New Revision: 2841
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2841

Log:
Fixed tag file by adding header so that vtags.el can recognize it, and in the kernel, write the tag when the word is really defined, instead of at the first (possibly forward) reference.

Modified:
   forth/kernel/meta1.fth
   forth/kernel/metacompile.fth
   forth/lib/toctags

Modified: forth/kernel/meta1.fth
==============================================================================
--- forth/kernel/meta1.fth	Mon Jan 23 18:55:53 2012	(r2840)
+++ forth/kernel/meta1.fth	Mon Jan 23 18:55:59 2012	(r2841)
@@ -59,7 +59,7 @@
    context link@ >r   current link@ >r   warning @ >r
    context link!  definitions
    warning off
-   tag-file @ >r  meta-tag-file @ tag-file !
+   tag-file @ >r  tag-file off
    $create
    r> tag-file !
    r> warning !   r> current link!   r> context link!

Modified: forth/kernel/metacompile.fth
==============================================================================
--- forth/kernel/metacompile.fth	Mon Jan 23 18:55:53 2012	(r2840)
+++ forth/kernel/metacompile.fth	Mon Jan 23 18:55:59 2012	(r2841)
@@ -374,7 +374,10 @@
 : $header-t  (s name$ cf$ -- )   \ Make a header in the target area
    2>r
    2dup last-header$ 2!
+   tag-file @ >r  meta-tag-file @ tag-file !
+   2dup $tagout
    2dup $create-s                            \ symbol table entry
+   r> tag-file !
    \ Make header unless headerless
    make-header?  if  2dup $really-header-t  then
    \Tags  $header-t-hook

Modified: forth/lib/toctags
==============================================================================
--- forth/lib/toctags	Mon Jan 23 18:55:53 2012	(r2840)
+++ forth/lib/toctags	Mon Jan 23 18:55:59 2012	(r2841)
@@ -6,5 +6,13 @@
 homedir=$1
 shift
 
-sed -e "s,\${BP},${homedir}," $* | LC_ALL=C sort >tags
+cat >tags.hdr <<EOF
+!_TAG_FILE_FORMAT 1
+!_TAG_FILE_SORTED 1
+!_TAG_PROGRAM_NAME OpenFirmwareBuilder
+!_TAG_PROGRAM_VERSION 1
+EOF
+
+sed -e "s,\${BP},${homedir}," $* | LC_ALL=C sort | uniq | cat tags.hdr - >tags
+rm tags.hdr