openbios/fcode-utils

diff --git a/testsuite/TokBrack/TestArgs b/testsuite/TokBrack/TestArgs
index c1cd5be..ef80f22 100644
--- a/testsuite/TokBrack/TestArgs
+++ b/testsuite/TokBrack/TestArgs
@@ -10,7 +10,7 @@
 #          Lines that have no label, no switches, and no script
 #              do not need any commas.
 
-#  Updated Wed, 08 Mar 2006 at 19:11 PST by David L. Paktor
+#  Updated Wed, 11 Oct 2006 at 24:44 PDT by David L. Paktor
 
 #  Might as well get the date-and-time one out of the way first...
 TokBrkTst_02 , , -i -l
@@ -18,3 +18,4 @@ TokBrkTst_01 , , -i
 TokBrkTst_01 , alwyshdr , -i -f ALWays-heADers
 TokBrkTst_03
 TokBrkErrTst_01 , , -i
+TokBrkTst_04 , , -i -T pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz -T whatsis 
diff --git a/testsuite/TokBrack/TokBrkTst_04.fth b/testsuite/TokBrack/TokBrkTst_04.fth
new file mode 100644
index 0000000..db614d8
--- /dev/null
+++ b/testsuite/TokBrack/TokBrkTst_04.fth
@@ -0,0 +1,76 @@
+\  Test of long names and duplication of names and maybe Tracing 
+\   Updated Wed, 18 Oct 2006 at 13:34 PDT by David L. Paktor
+
+fcode-version2
+
+global-definitions
+
+true constant flunky?
+
+alias whoosis whatsis
+alias whatsis whoosis
+
+external
+decimal
+
+100 constant pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz
+
+device-definitions
+
+headers
+
+h#  3760  constant whatsis
+
+#message" Sync Up Diffs w/ prev. release."n"
+alias whoosis pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz
+#message"
+Sync Up again."n"
+headerless
+: pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz
+     100
+;
+pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz 2 * constant clone
+
+\  Make sure the matching goes all the way...
+instance
+: pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_oilum
+     clone
+     ['] whoosis execute
+;
+
+new-device
+80 constant  this_name_has_a_whole_lot_of_syllables_and_so_would_not_be_a_good_ingredient_in_ice_cream_but_at_least_you_know_what_it_means
+
+headers
+  f[    1cec6ea3  constant  a_name_with_too_many_letters_should_not_matter_in_tokenizer_escape_mode
+   ]f
+
+: brand-x-ice-cream  \  Because it uses ingredients with too many syllables
+    pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz    dup 20 - do  i . loop  cr
+   ." Nameless one..." this_name_has_a_whole_lot_of_syllables_and_so_would_not_be_a_good_ingredient_in_ice_cream_but_at_least_you_know_what_it_means  ." equals " . cr  
+   ." But everyone likes an "
+   f[   a_name_with_too_many_letters_should_not_matter_in_tokenizer_escape_mode
+   f]      fliteral  .
+    clone . cr
+;
+
+flunky? if
+    d# 3760 constant whatsis
+else
+    d#  374 constant whatsis
+then
+
+
+finish-device
+
+overload : clone
+    pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz
+    pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_oilum
+    whatsis
+    whoosis
+;
+
+end0
+
+
+
diff --git a/testsuite/TokCondl/CondMacAlias_01.fth b/testsuite/TokCondl/CondMacAlias_01.fth
index 98465e6..c9e1025 100644
--- a/testsuite/TokCondl/CondMacAlias_01.fth
+++ b/testsuite/TokCondl/CondMacAlias_01.fth
@@ -76,7 +76,7 @@
 	f[  ."  Let's try some spurious [else] action, whaddya say?"  ]f
 	: [else]  ."  Don't do it" ;  [message]  Fake [else] got through
 	create [else]   [message]  Fake [else] got through
-	h# defeca8e constant [else]   [message]  Fake [else] got through
+	h# DeFeCA8e constant [else]   [message]  Fake [else] got through
 	h# -41100132 value [else]   [message]  Fake [else] got through
 	d# 64  buffer: [else]   [message]  Fake [else] got through
 	 struct
diff --git a/testsuite/TokCondl/TestArgs b/testsuite/TokCondl/TestArgs
index 274fcb6..4d98da0 100644
--- a/testsuite/TokCondl/TestArgs
+++ b/testsuite/TokCondl/TestArgs
@@ -10,7 +10,7 @@
 #          Lines that have no label, no switches, and no script
 #              do not need any commas.
 
-#  Updated Thu, 27 Jul 2006 at 15:20 PDT by David L. Paktor
+#  Updated Fri, 13 Oct 2006 at 16:19 PDT by David L. Paktor
 
 TokExstCondTstY , , -l
 TokExstCondTstN , , -l
diff --git a/testsuite/TokMisc/AllBiFCTypes.fth b/testsuite/TokMisc/AllBiFCTypes.fth
index 8eddcf3..9f0e7bd 100644
--- a/testsuite/TokMisc/AllBiFCTypes.fth
+++ b/testsuite/TokMisc/AllBiFCTypes.fth
@@ -1,7 +1,7 @@
 \  Test all the known Built-In FCode tokens
 \     that have specific definition Types
 
-\  Updated Wed, 16 Aug 2006 at 14:30 PDT by David L. Paktor
+\  Updated Tue, 10 Oct 2006 at 11:00 PDT by David L. Paktor
 
 \  Applying "TO" to them ought to generate errors
 \  except for the ones that legitimately take "TO",
@@ -9,7 +9,6 @@
 
 fcode-version2
 
-
 [message]  Constants.  Should generate errors
 d# 10 to -1  (  CONST  )
 d# 10 to -1  (  CONST  )
@@ -61,4 +60,12 @@ h# 12 to  mask  (  VRBLE  )
 h# 12 to  span  (  VRBLE  )
 h# 12 to  state  (  VRBLE  )
 
+multi-line  #message" Using ['] on words that are both FWords and FCodes "\
+                      should generate no errors"
+['] new-device     drop
+['] finish-device  drop
+['] offset16       drop
+['] instance       drop
+['] end0           drop
+
 fcode-end
diff --git a/testsuite/TokMisc/ContErr0.fth b/testsuite/TokMisc/ContErr0.fth
new file mode 100644
index 0000000..1045cbe
--- /dev/null
+++ b/testsuite/TokMisc/ContErr0.fth
@@ -0,0 +1,73 @@
+\  Test Erroneous Control Constructs, cunningly contrived
+\     to pass the "Old" tokenizer, which doesn't have the
+\     check for Control-Structure matching.
+
+\  Updated Thu, 29 Jun 2006 at 14:52 PDT by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+: garfield
+    ." if" if
+    ." begin" begin
+        \  \  Leave this out because Old tokenizer duzzent dew it rite....
+	\  ." Question-Leave?" ?leave
+	." 0 if unloop exit then"  0 if unloop exit then
+        ." Would you be leave..."  leave
+    ." loop?"  loop
+   ." Done with garfield"
+;
+
+: odie
+    ." 0 0 ?do"  0 0 ?do
+        ." i drop" i drop
+	." zero if unloop exit then"  0 if unloop exit then
+        ." Who would be leave..."  leave
+    ." again" again
+    ." then" then
+    ." Done with odie"
+;
+
+."  Outside of colon"
+." 1 0 do" 1 0 do
+    i constant what?   ." This is actually supposed to be legit..."
+." again" again
+." then" then
+." Was that awful or what?"
+
+\  Snippet similar to something in Firmworks manual
+
+h# 5000  constant /DHCP-SCRATCH 
+
+/DHCP-SCRATCH ( size ) ['] alloc-mem
+." dhcp-scratch alloc-mem" cr .s cr
+catch
+." catch dhcp-scratch alloc-mem" cr .s cr
+?dup if
+   ." alloc-mem Failed!!!" cr .s cr
+   throw
+   ."  This is also worng..."   exit
+else
+  ." alloc-mem okay." .s cr
+   ( vaddr )
+   ( vaddr ) constant DHCP-SCRATCH
+then
+
+\  A CASE statement where the ENDOFs are missing
+\      still passes the "Old" tokenizer.
+
+: crazy-aces ( n -- )
+   case
+      0 of ." And a-nutt'n'"
+      1 of ." And a-won"
+      2 of ." And a-too"
+      3 of ." And a-tree"
+      4 of ." and afford"
+      5 of ." Dat's enuff"
+     ( default ) ." It's not my default!"
+   endcase  ."  Just in case you end up here..."
+;
+
+fcode-end
diff --git a/testsuite/TokMisc/ContErr3.fth b/testsuite/TokMisc/ContErr3.fth
index 5190936..277fb3a 100644
--- a/testsuite/TokMisc/ContErr3.fth
+++ b/testsuite/TokMisc/ContErr3.fth
@@ -132,8 +132,8 @@ repeat
     then
 loop
 
-#message" Same line as a loop"  ." ...Same line as a loop"
-
+#message"
+ Same line as a loop"  ." ...Same line as a loop"
 4 0 do i test_something if to targ : runny_stuff  begin
     1 0 do targ u.   #message" Error here, too..."  j
     #message" But not here either"  1 0 do j . loop
diff --git a/testsuite/TokMisc/DtkVSFcTst.scr b/testsuite/TokMisc/DtkVSFcTst.scr
new file mode 100755
index 0000000..55ad7ce
--- /dev/null
+++ b/testsuite/TokMisc/DtkVSFcTst.scr
@@ -0,0 +1,41 @@
+#!  /bin/csh -f
+#
+#  Script to run detokenizer with Vendor-Specific FCodes.
+#   This worked just fine on the TestArgs command line, in the "script" field
+#      on CygWin and GNU_Linux, but gets jammed-up on AI
+#  So we have to pump it into a separate script.  Fooey!
+#
+#  Well, in for a penny and all that...X
+#  Let's make it a bit more general.
+#  First param is the base-name of both the input .fc file
+#      and the output .DeTok file
+#  Second param is the name of the Vendor-Specific FCodes file
+
+#  If it's already a script, might as well error-check
+alias onecr  'echo "" ; alias onecr true' 
+if ( $#argv < 1 ) then
+    onecr
+    echo $0 Missing First arg, Base-name of input .fc and output .DeTok files
+    set ERROR
+endif
+if ( $#argv < 2 ) then
+    onecr
+    echo $0 Missing Second arg, Name of the Vendor-Specific FCodes file
+    set ERROR
+endif
+if ( $?ERROR ) exit 1
+
+if ( ! -r $1.fc ) then
+    onecr
+    echo $0 Cannot read input file $1.fc
+    set ERROR
+endif
+if ( ! -r $2 ) then
+    onecr
+    echo $0 Cannot read Vendor-Specific FCodes file $2
+    set ERROR
+endif
+if ( $?ERROR ) exit 2
+
+
+../detok -v -o -f $2 $1.fc > $1.DeTok
diff --git a/testsuite/TokMisc/MiscFeatures.DOS.fth b/testsuite/TokMisc/MiscFeatures.DOS.fth
index b74221f..a4f7966 100644
--- a/testsuite/TokMisc/MiscFeatures.DOS.fth
+++ b/testsuite/TokMisc/MiscFeatures.DOS.fth
@@ -1,6 +1,5 @@
 \  Obvious pun intended...
-\   Updated Tue, 31 May 2005 at 12:07 by David L. Paktor
-
+\   Updated Tue, 17 Oct 2006 at 12:57 PDT by David L. Paktor
 
 alias // \
 fcode-version2
@@ -12,21 +11,41 @@ headers
 char G emit
 control G emit
 control [ emit
+global-definitions
+\  Each dev-node will create its own debug-flag and alias it to  debug-me?
+\  Each dev-node will create a macro called my-dev-name giving its device-name
+    [macro] .fname&dev    [function-name] type ."  in " my-dev-name type 
+    [macro] name-my-dev   my-dev-name device-name
+    [macro] .dbg-enter  debug-me? @ if ." Entering " .fname&dev cr then
+    [macro] .dbg-leave  debug-me? @ if ." Leaving "  .fname&dev cr then
+device-definitions
+
+\  Top-most device, named billy
+[macro] my-dev-name  " billy"
+name-my-dev
+
+variable debug-bell?  debug-bell? off   alias debug-me? debug-bell?
 : bell
+    .dbg-enter
     [char] G dup
     control G 3drop
+    .dbg-leave
 ;
 
 : factl recursive  ( n -- n! )
+    ." Entering First vers. of " [function-name] type cr
     ?dup 0= if 1
-    else  dup 1-  *  factl
+    else  dup 1-  factl *
     then
+    ." Leaving First vers. of " [function-name] type cr
 ;
 
 : factl ( n -- n! )
+    ." Entering Second vers. of " [function-name] type cr
     ?dup 0= if 1 factl
     else  dup 1- recurse *
     then
+    ." Leaving Second vers. of " [function-name] type cr
 ;
 
 variable naught
@@ -41,31 +60,88 @@ struct
 constant /four
 
 : peril
+    .dbg-enter
     ['] noop is  do-nothing
     100 is thirty
     5 is naught
     thirty dup - abort" Never Happen"
+    .dbg-leave
 ;
 
 : thirty ( new-val -- )
+    .dbg-enter
     dup to thirty
 	alias .dec .d		\  Should this be allowed?
     ." Dirty"  .dec
+    .dbg-leave
 ;
 tokenizer[ 
 alias fliteral1 fliteral    //   This should be a harmless remark.
 h# deadc0de ]tokenizer  fliteral1
 
+\  First subsidiary device, "child" of billy
+new-device
+    instance variable cheryl
+    [macro]  my-dev-name  " cheryl"
+    name-my-dev
+
+    instance
+    \  Third-level device, "grandchild" of billy
+    new-device
+        [macro]  my-dev-name  " meryl"
+        name-my-dev
+
+	variable beryl
+
+        variable debug-meryl?  debug-meryl? off
+        alias debug-me? debug-meryl?
+	    : meryl
+		.dbg-enter
+        	cheryl
+		alias .deck .dec
+		alias feral cheryl
+		alias .heck .h
+		.dbg-leave
+	    ;
+    finish-device
+
+    \  Now we're back to "cheryl"
+    
+    variable debug-cheryl?  debug-cheryl? off
+    alias debug-me? debug-cheryl?
+     : queryl
+	.dbg-enter
+	over rot dup nip drop swap   \  Not the most useful code...  ;-}
+	.dbg-leave
+     ;
+finish-device
+
+\  Some interpretation-time after the fact markers...
+alias colon :
+overload [macro] : ." Cleared " [input-file-name] type ." line " [line-number] .d cr colon 
+
+alias semicolon ;
+overload [macro] ;  semicolon ." Finished defining " [function-name] type cr
+
+\  And we're back to billy.
 : droop ( -- )
+    .dbg-enter            \  This will display  Entering droop in billy
     twenty
     tokenizer[
 	alias .x .h		\  Should this generate a warning?
+	[function-name]
     ]tokenizer
     0 ?do i .x loop
-;
+    .dbg-leave
+;       f[  [function-name]   ]f
+headerless
 : ploop ( -- )
+    .dbg-enter
     fifty  0 do i drop 2 +loop
+    .dbg-leave
 ;
+overload alias  : colon 
+overload alias ; semicolon
 
 fcode-end
 
diff --git a/testsuite/TokMisc/MiscFeatures.fth b/testsuite/TokMisc/MiscFeatures.fth
index 80d9b4f..16dabd4 100644
--- a/testsuite/TokMisc/MiscFeatures.fth
+++ b/testsuite/TokMisc/MiscFeatures.fth
@@ -1,5 +1,5 @@
 \  Obvious pun intended...
-\   Updated Fri, 10 Feb 2006 at 15:53 PST by David L. Paktor
+\   Updated Tue, 17 Oct 2006 at 12:57 PDT by David L. Paktor
 
 alias // \
 fcode-version2
@@ -116,22 +116,32 @@ new-device
      ;
 finish-device
 
+\  Some interpretation-time after the fact markers...
+alias colon :
+overload [macro] : ." Cleared " [input-file-name] type ." line " [line-number] .d cr colon 
+
+alias semicolon ;
+overload [macro] ;  semicolon ." Finished defining " [function-name] type cr
+
 \  And we're back to billy.
 : droop ( -- )
     .dbg-enter            \  This will display  Entering droop in billy
     twenty
     tokenizer[
 	alias .x .h		\  Should this generate a warning?
+	[function-name]
     ]tokenizer
     0 ?do i .x loop
     .dbg-leave
-;
+;       f[  [function-name]   ]f
 headerless
 : ploop ( -- )
     .dbg-enter
     fifty  0 do i drop 2 +loop
     .dbg-leave
 ;
+overload alias  : colon 
+overload alias ; semicolon
 
 fcode-end
 
diff --git a/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.DeTok b/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.DeTok
deleted file mode 100644
index 5b4aa86..0000000
--- a/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.DeTok
+++ /dev/null
@@ -1,195 +0,0 @@
-\  Welcome to the OpenBIOS detokenizer v0.6.1
-\  detok Copyright(c) 2001-2005 by Stefan Reinauer.
-\  Written by Stefan Reinauer, <stepan@openbios.org>
-\  This program is free software; you may redistribute it under the terms of
-\  the GNU General Public License.  This program has absolutely no warranty.
-\  
-\  (C) Copyright 2005 IBM Corporation.  All Rights Reserved.
-     0: start1 ( 0x0f1 )   ( 16-bit offsets)
-     1:   format:    0x08
-     2:   checksum:  0xf891 (Ok)
-     4:   len:       0x0302 ( 770 bytes)
-     8: named-token ( 0x0b6 ) garfield 0x800
-    20: b(:) ( 0x0b7 ) 
-    21:     b(") ( 0x012 ) ( len=2 )
-                    " if"
-    25:     type ( 0x090 ) 
-    26:     b?branch ( 0x014 ) 0x004e ( =dec 78  dest = 105 )
-    29:         b(") ( 0x012 ) ( len=5 )
-                        " begin"
-    36:         type ( 0x090 ) 
-    37:         b(<mark) ( 0x0b1 ) 
-    38:             b(") ( 0x012 ) ( len=0x15 [21 bytes] )
-                            " 0 if unloop exit then"
-    61:             type ( 0x090 ) 
-    62:             0 ( 0x0a5 ) 
-    63:             b?branch ( 0x014 ) 0x0005 (  dest = 69 )
-    66:                 unloop ( 0x089 ) 
-    67:                 exit ( 0x033 ) 
-    68:             b(>resolve) ( 0x0b2 ) 
-    69:             b(") ( 0x012 ) ( len=0x15 [21 bytes] )
-                            " Would you be leave..."
-    92:             type ( 0x090 ) 
-    93:             b(leave) ( 0x01b ) 
-    94:             b(") ( 0x012 ) ( len=5 )
-                            " loop?"
-   101:             type ( 0x090 ) 
-   102:         b(loop) ( 0x015 ) 0xffbf ( =dec -65  dest = 38 )
-   105:         b(") ( 0x012 ) ( len=0x12 [18 bytes] )
-                        " Done with garfield"
-   125:         type ( 0x090 ) 
-   126:     b(;) ( 0x0c2 ) 
-   127:     named-token ( 0x0b6 ) odie 0x801
-   135:     b(:) ( 0x0b7 ) 
-   136:         b(") ( 0x012 ) ( len=7 )
-                        " 0 0 ?do"
-   145:         type ( 0x090 ) 
-   146:         0 ( 0x0a5 ) 
-   147:         0 ( 0x0a5 ) 
-   148:         b(?do) ( 0x018 ) 0x005b ( =dec 91  dest = 240 )
-   151:             b(") ( 0x012 ) ( len=6 )
-                            " i drop"
-   159:             type ( 0x090 ) 
-   160:             i ( 0x019 ) 
-   161:             drop ( 0x046 ) 
-   162:             b(") ( 0x012 ) ( len=0x18 [24 bytes] )
-                            " zero if unloop exit then"
-   188:             type ( 0x090 ) 
-   189:             0 ( 0x0a5 ) 
-   190:             b?branch ( 0x014 ) 0x0005 (  dest = 196 )
-   193:                 unloop ( 0x089 ) 
-   194:                 exit ( 0x033 ) 
-   195:             b(>resolve) ( 0x0b2 ) 
-   196:             b(") ( 0x012 ) ( len=0x15 [21 bytes] )
-                            " Who would be leave..."
-   219:             type ( 0x090 ) 
-   220:             b(leave) ( 0x01b ) 
-   221:             b(") ( 0x012 ) ( len=5 )
-                            " again"
-   228:             type ( 0x090 ) 
-   229:             bbranch ( 0x013 ) 0xffb1 ( =dec -79  dest = 151 )
-   232:         b(") ( 0x012 ) ( len=4 )
-                        " then"
-   238:         type ( 0x090 ) 
-   239:     b(>resolve) ( 0x0b2 ) 
-   240:     b(") ( 0x012 ) ( len=0xe [14 bytes] )
-                    " Done with odie"
-   256:     type ( 0x090 ) 
-   257: b(;) ( 0x0c2 ) 
-   258: b(") ( 0x012 ) ( len=0x11 [17 bytes] )
-                "  Outside of colon"
-   277: type ( 0x090 ) 
-   278: b(") ( 0x012 ) ( len=6 )
-                " 1 0 do"
-   286: type ( 0x090 ) 
-   287: 1 ( 0x0a6 ) 
-   288: 0 ( 0x0a5 ) 
-   289: b(do) ( 0x017 ) 0x004b ( =dec 75  dest = 365 )
-   292:     i ( 0x019 ) 
-   293:     named-token ( 0x0b6 ) what? 0x802
-   302:     b(constant) ( 0x0ba ) 
-   303:     b(") ( 0x012 ) ( len=0x28 [40 bytes] )
-                    " This is actually supposed to be legit..."
-   345:     type ( 0x090 ) 
-   346:     b(") ( 0x012 ) ( len=5 )
-                    " again"
-   353:     type ( 0x090 ) 
-   354:     bbranch ( 0x013 ) 0xffc1 ( =dec -63  dest = 292 )
-   357: b(") ( 0x012 ) ( len=4 )
-                " then"
-   363: type ( 0x090 ) 
-   364: b(>resolve) ( 0x0b2 ) 
-   365: b(") ( 0x012 ) ( len=0x17 [23 bytes] )
-                " Was that awful or what?"
-   390: type ( 0x090 ) 
-   391: b(lit) ( 0x010 ) 0x5000
-   396: named-token ( 0x0b6 ) /DHCP-SCRATCH 0x803
-   413: b(constant) ( 0x0ba ) 
-   414: /DHCP-SCRATCH ( 0x803 ) 
-   416: b(') ( 0x011 ) alloc-mem ( 0x08b ) 
-   418: b(") ( 0x012 ) ( len=0x16 [22 bytes] )
-                " dhcp-scratch alloc-mem"
-   442: type ( 0x090 ) 
-   443: cr ( 0x092 ) 
-   444: .s ( 0x09f ) 
-   445: cr ( 0x092 ) 
-   446: catch ( 0x217 ) 
-   448: b(") ( 0x012 ) ( len=0x1c [28 bytes] )
-                " catch dhcp-scratch alloc-mem"
-   478: type ( 0x090 ) 
-   479: cr ( 0x092 ) 
-   480: .s ( 0x09f ) 
-   481: cr ( 0x092 ) 
-   482: ?dup ( 0x050 ) 
-   483: b?branch ( 0x014 ) 0x003b ( =dec 59  dest = 543 )
-   486:     b(") ( 0x012 ) ( len=0x13 [19 bytes] )
-                    " alloc-mem Failed!!!"
-   507:     type ( 0x090 ) 
-   508:     cr ( 0x092 ) 
-   509:     .s ( 0x09f ) 
-   510:     cr ( 0x092 ) 
-   511:     throw ( 0x218 ) 
-   513:     b(") ( 0x012 ) ( len=0x16 [22 bytes] )
-                    "  This is also worng..."
-   537:     type ( 0x090 ) 
-   538:     exit ( 0x033 ) 
-   539:     bbranch ( 0x013 ) 0x0029 ( =dec 41  dest = 581 )
-   542:     b(>resolve) ( 0x0b2 ) 
-   543:     b(") ( 0x012 ) ( len=0xf [15 bytes] )
-                    " alloc-mem okay."
-   560:     type ( 0x090 ) 
-   561:     .s ( 0x09f ) 
-   562:     cr ( 0x092 ) 
-   563:     named-token ( 0x0b6 ) DHCP-SCRATCH 0x804
-   579:     b(constant) ( 0x0ba ) 
-   580: b(>resolve) ( 0x0b2 ) 
-   581: named-token ( 0x0b6 ) crazy-aces 0x805
-   595: b(:) ( 0x0b7 ) 
-   596:     b(case) ( 0x0c4 ) 
-   597:         0 ( 0x0a5 ) 
-   598:         b(of) ( 0x01c ) 0x0000 (  dest = 599 )
-\  Error:  Unresolved offset.
-   601:             b(") ( 0x012 ) ( len=0xd [13 bytes] )
-                            " And a-nutt'n'"
-   616:             type ( 0x090 ) 
-   617:             1 ( 0x0a6 ) 
-   618:             b(of) ( 0x01c ) 0x0000 (  dest = 619 )
-\  Error:  Unresolved offset.
-   621:                 b(") ( 0x012 ) ( len=9 )
-                                " And a-won"
-   632:                 type ( 0x090 ) 
-   633:                 2 ( 0x0a7 ) 
-   634:                 b(of) ( 0x01c ) 0x0000 (  dest = 635 )
-\  Error:  Unresolved offset.
-   637:                     b(") ( 0x012 ) ( len=9 )
-                                    " And a-too"
-   648:                     type ( 0x090 ) 
-   649:                     3 ( 0x0a8 ) 
-   650:                     b(of) ( 0x01c ) 0x0000 (  dest = 651 )
-\  Error:  Unresolved offset.
-   653:                         b(") ( 0x012 ) ( len=0xa [10 bytes] )
-                                        " And a-tree"
-   665:                         type ( 0x090 ) 
-   666:                         b(lit) ( 0x010 ) 0x4
-   671:                         b(of) ( 0x01c ) 0x0000 (  dest = 672 )
-\  Error:  Unresolved offset.
-   674:                             b(") ( 0x012 ) ( len=0xa [10 bytes] )
-                                            " and afford"
-   686:                             type ( 0x090 ) 
-   687:                             b(lit) ( 0x010 ) 0x5
-   692:                             b(of) ( 0x01c ) 0x0028 ( =dec 40  dest = 733 )
-   695:                                 b(") ( 0x012 ) ( len=0xb [11 bytes] )
-                                                " Dat's enuff"
-   708:                                 type ( 0x090 ) 
-   709:                                 b(") ( 0x012 ) ( len=0x14 [20 bytes] )
-                                                " It's not my default!"
-   731:                                 type ( 0x090 ) 
-   732:                             b(endcase) ( 0x0c5 ) 
-   733:                             b(") ( 0x012 ) ( len=0x20 [32 bytes] )
-                                            "  Just in case you end up here..."
-   767:                             type ( 0x090 ) 
-   768:                         b(;) ( 0x0c2 ) 
-   769:                         end0 ( 0x000 ) 
-\  Detokenization finished normally after 770 bytes.
-End of file.
-
diff --git a/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.Log b/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.Log
deleted file mode 100644
index f758c45..0000000
--- a/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.Log
+++ /dev/null
@@ -1,7 +0,0 @@
-Welcome to toke - OpenBIOS tokenizer v0.6.8
-Copyright (c) 2001-2005 by Stefan Reinauer <stepan@openbios.org>
-This program is free software; you may redistribute it under the terms of
-the GNU General Public License. This program has absolutely no warranty.
-
-toke: checksum is 0xf891 (770 bytes)
-toke: wrote 770 bytes to bytecode file 'ContErr0.OldTkzr.fc'
diff --git a/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.fc b/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.fc
deleted file mode 100644
index b728773..0000000
Binary files a/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.fc and /dev/null differ
diff --git a/testsuite/TokMisc/OldTkzr/ContErr0.fth b/testsuite/TokMisc/OldTkzr/ContErr0.fth
deleted file mode 100644
index 1045cbe..0000000
--- a/testsuite/TokMisc/OldTkzr/ContErr0.fth
+++ /dev/null
@@ -1,73 +0,0 @@
-\  Test Erroneous Control Constructs, cunningly contrived
-\     to pass the "Old" tokenizer, which doesn't have the
-\     check for Control-Structure matching.
-
-\  Updated Thu, 29 Jun 2006 at 14:52 PDT by David L. Paktor
-
-
-fcode-version2
-
-headers
-
-: garfield
-    ." if" if
-    ." begin" begin
-        \  \  Leave this out because Old tokenizer duzzent dew it rite....
-	\  ." Question-Leave?" ?leave
-	." 0 if unloop exit then"  0 if unloop exit then
-        ." Would you be leave..."  leave
-    ." loop?"  loop
-   ." Done with garfield"
-;
-
-: odie
-    ." 0 0 ?do"  0 0 ?do
-        ." i drop" i drop
-	." zero if unloop exit then"  0 if unloop exit then
-        ." Who would be leave..."  leave
-    ." again" again
-    ." then" then
-    ." Done with odie"
-;
-
-."  Outside of colon"
-." 1 0 do" 1 0 do
-    i constant what?   ." This is actually supposed to be legit..."
-." again" again
-." then" then
-." Was that awful or what?"
-
-\  Snippet similar to something in Firmworks manual
-
-h# 5000  constant /DHCP-SCRATCH 
-
-/DHCP-SCRATCH ( size ) ['] alloc-mem
-." dhcp-scratch alloc-mem" cr .s cr
-catch
-." catch dhcp-scratch alloc-mem" cr .s cr
-?dup if
-   ." alloc-mem Failed!!!" cr .s cr
-   throw
-   ."  This is also worng..."   exit
-else
-  ." alloc-mem okay." .s cr
-   ( vaddr )
-   ( vaddr ) constant DHCP-SCRATCH
-then
-
-\  A CASE statement where the ENDOFs are missing
-\      still passes the "Old" tokenizer.
-
-: crazy-aces ( n -- )
-   case
-      0 of ." And a-nutt'n'"
-      1 of ." And a-won"
-      2 of ." And a-too"
-      3 of ." And a-tree"
-      4 of ." and afford"
-      5 of ." Dat's enuff"
-     ( default ) ." It's not my default!"
-   endcase  ."  Just in case you end up here..."
-;
-
-fcode-end
diff --git a/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.DeTok b/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.DeTok
deleted file mode 100644
index e543412..0000000
--- a/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.DeTok
+++ /dev/null
@@ -1,42 +0,0 @@
-\  Welcome to the OpenBIOS detokenizer v0.6.1
-\  detok Copyright(c) 2001-2005 by Stefan Reinauer.
-\  Written by Stefan Reinauer, <stepan@openbios.org>
-\  This program is free software; you may redistribute it under the terms of
-\  the GNU General Public License.  This program has absolutely no warranty.
-\  
-\  (C) Copyright 2005 IBM Corporation.  All Rights Reserved.
-     0: start1 ( 0x0f1 )   ( 16-bit offsets)
-     1:   format:    0x08
-     2:   checksum:  0x8805 (Ok)
-     4:   len:       0x0187 ( 391 bytes)
-     8: b(") ( 0x012 ) ( len=0x2e [46 bytes] )
-                " Let's also test a few string-escape sequences:"
-    56: type ( 0x090 ) 
-    57: b(") ( 0x012 ) ( len=0x2c [44 bytes] )
-                " "( 09 )ab"( 0a )ew-line""uote"( 0d )eturn"( 0c )orm-feed"( 08 )ackspace"( 07 )ell"
-   103: type ( 0x090 ) 
-   104: b(") ( 0x012 ) ( len=0x20 [32 bytes] )
-                " "( 03 )ontrol-D:ontrol-brace is Escape"
-   138: type ( 0x090 ) 
-   139: b(") ( 0x012 ) ( len=0x1c [28 bytes] )
-                "  First try these two in hex:"
-   169: type ( 0x090 ) 
-   170: b(") ( 0x012 ) ( len=0x2b [43 bytes] )
-                " Backslash-n"( 0a )NewLine"( 09 )TabJd-a-OneTwoThreeFour"
-   215: type ( 0x090 ) 
-   216: b(") ( 0x012 ) ( len=0x29 [41 bytes] )
-                " Backslashes on both ends:4OneTwoThreeFour"
-   259: type ( 0x090 ) 
-   260: b(") ( 0x012 ) ( len=0x24 [36 bytes] )
-                "  Try them again, but now in decimal:"
-   298: type ( 0x090 ) 
-   299: b(") ( 0x012 ) ( len=0x2c [44 bytes] )
-                " Backslash-n"( 0a )NewLine"( 09 )Tab"( d2 )nd-a-OneTwoThreeFour"
-   345: type ( 0x090 ) 
-   346: b(") ( 0x012 ) ( len=0x29 [41 bytes] )
-                " Backslashes on both ends:"( d2 )OneTwoThreeFour"
-   389: type ( 0x090 ) 
-   390: end0 ( 0x000 ) 
-\  Detokenization finished normally after 391 bytes.
-End of file.
-
diff --git a/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.Log b/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.Log
deleted file mode 100644
index a36e270..0000000
--- a/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.Log
+++ /dev/null
@@ -1,7 +0,0 @@
-Welcome to toke - OpenBIOS tokenizer v0.6.8
-Copyright (c) 2001-2005 by Stefan Reinauer <stepan@openbios.org>
-This program is free software; you may redistribute it under the terms of
-the GNU General Public License. This program has absolutely no warranty.
-
-toke: checksum is 0x8805 (391 bytes)
-toke: wrote 391 bytes to bytecode file 'SimplStrEscs.OldTkzr.fc'
diff --git a/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.fc b/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.fc
deleted file mode 100644
index 25ff7b2..0000000
Binary files a/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.fc and /dev/null differ
diff --git a/testsuite/TokMisc/OldTkzr/SimplStrEscs.fth b/testsuite/TokMisc/OldTkzr/SimplStrEscs.fth
deleted file mode 100644
index 6778318..0000000
--- a/testsuite/TokMisc/OldTkzr/SimplStrEscs.fth
+++ /dev/null
@@ -1,22 +0,0 @@
-\  A few simple string-escape sequences.
-\     See which ones the "Old" tokenizer handles differently...
-
-
-fcode-version2
-
-." Let's also test a few string-escape sequences:"
-." "ttab"nnew-line""quote"rreturn"fform-feed"bbackspace"!bell"
-." "^Dcontrol-D"^{Control-brace is Escape"
-
-."  First try these two in hex:"
-hex
-
-." Backslash-n\nNewLine\tTab\1234And-a-OneTwoThreeFour"
-." Backslashes on both ends:\1234\OneTwoThreeFour"
-
-."  Try them again, but now in decimal:"
-decimal
-." Backslash-n\nNewLine\tTab\1234And-a-OneTwoThreeFour"
-." Backslashes on both ends:\1234\OneTwoThreeFour"
-
-fcode-end
diff --git a/testsuite/TokMisc/StringsGenl.fth b/testsuite/TokMisc/StringsGenl.fth
index 33df7b9..e690259 100644
--- a/testsuite/TokMisc/StringsGenl.fth
+++ b/testsuite/TokMisc/StringsGenl.fth
@@ -1,6 +1,6 @@
 \  Test of various formats of strings
 
-\  Updated Mon, 06 Mar 2006 at 17:39 PST by David L. Paktor
+\  Updated Tue, 10 Oct 2006 at 11:46 PDT by David L. Paktor
 
 fcode-version2
 
@@ -9,13 +9,14 @@ headers hex
 ."
 Empty string next."
 ." "
-." BSlashes: \t\1fea9\abdc\n\1f\\fece"
+." BSlashes#1: \t\1fea9\abdc\n\1f\\fece"
 decimal
-." BSlashes: \t\a7\c01a"
+." BSlashes#2: \t\a7\c01a"
+." Dec 1193176 = 0x1234D8 Dec 176 = 0xB0 \1193176\"
 hex
-." BSlashes: \n\a7\c01a"
-." BSlashes: \t\a7\\c0\\1a"
-." BSlashes: \t\a7\\c0\\1a"( feedface)"
+." BSlashes#3: \n\a7\c01a"
+." BSlashes#4: \t\a7\\c0\\1a"
+." BSlashes#5: \t\a7\\c0\\1a"( feedface)"
 ." 3 BSlashes, then QOpen. \t\Q\n"(090abcdefeca8e beeffece b020)Zoh. "(1 23 4 567 8 9 0 1 2 3 0 a b c 30)"
 .( Dot-Paren-NoSpace)cr cr
 .( Dot-Paren Space) cr cr
diff --git a/testsuite/TokMisc/TestArgs b/testsuite/TokMisc/TestArgs
index fd316ef..e55daa5 100644
--- a/testsuite/TokMisc/TestArgs
+++ b/testsuite/TokMisc/TestArgs
@@ -7,8 +7,9 @@
 #                 A script-command with arguments (but no commas).
 #          Lines that have no label, no switches, and no script
 #              do not need any commas.
+#                 A leading +V in the script-command field will suppress -v
 
-#  Updated Thu, 07 Sep 2006 at 11:49 PDT by David L. Paktor
+#  Updated Mon, 16 Oct 2006 at 17:22 PDT by David L. Paktor
 
 MiscFeatures ,  ,  -i
 MiscFeatures , applabq ,  -i -f NOSUN-ABORT-Quote
@@ -23,15 +24,15 @@ StringsGenl , nohexrmk , -f noHex-remark-escape
 StringsGenl , noqbsrmk , -f NOSTRING-REMARK-ESCAPE
 BasicCont
 ExtCont
-OldTkzr/ContErr0 ,  ,  -i
+ContErr0 ,  ,  -i
 ContErr1 ,  ,  -i
 ContErr2 ,  ,  -i
 ContErr3 ,  ,  -i
 MulDev ,  ,  -i
 MulDev_01 ,  ,  -i
 MulDev_02 ,  ,  -i -T jeeky -T kinky
+MulDev_02 , NoV ,  -T jeeky -T kinky , +V
 MinPCIHtst
-OldTkzr/SimplStrEscs
 StrEscs
 StrEscs_01
 FlagSet ,  ,  -i
@@ -72,3 +73,7 @@ BatchTst , FHelp , -I. -I../TokeCommon -l  -f help , if ( "`cmp UserMacros.fc Us
 BatchTst ,  Help , -I. -I../TokeCommon -l  -h , rm *_cpy*
 
 CaseTkns
+
+#  Vendor-Specific FCodes, just a little...
+VSFCtest 
+VSFCtest , VSfc , , DtkVSFcTst.scr VSFCtest.VSfc VendSpecFCodes
diff --git a/testsuite/TokMisc/VSFCtest.fth b/testsuite/TokMisc/VSFCtest.fth
new file mode 100644
index 0000000..bf02214
--- /dev/null
+++ b/testsuite/TokMisc/VSFCtest.fth
@@ -0,0 +1,62 @@
+\  Generate something that looks like FCode generated by a Very Custom Tokenizer
+
+
+fcode-version1
+
+headers
+hex
+
+F[
+  \  If we want to test this against the previous release,
+  \      we can't do this: 341 emit-fcode
+  \  Instead, we have to do it in two parts:
+
+    03 emit-byte  41 emit-byte    \    0341 = "Simple" Vendor-specific FCode"
+    ]F
+-1
+dup 0> if
+F[
+    \  Likewise here    369 emit-fcode
+    03 emit-byte  69 emit-byte   \   0369 = "double(lit)"
+       ff  emit-byte
+         ff  emit-byte
+	   ff  emit-byte
+	     ff  emit-byte
+	       00  emit-byte
+        	 00  emit-byte
+		   00  emit-byte
+		     00  emit-byte
+    ]F
+then
+dup 0= if
+F[
+    \  Here, too        369 emit-fcode
+    03 emit-byte  69 emit-byte   \   0369 = "double(lit)"
+       ff  emit-byte
+         ff  emit-byte
+	   ff  emit-byte
+	     f0  emit-byte
+	       00  emit-byte
+        	 00  emit-byte
+		   00  emit-byte
+		     00  emit-byte
+    ]F
+then
+
+0< if
+F[
+    \  Last one         369 emit-fcode
+    03 emit-byte  69 emit-byte   \   0369 = "double(lit)"
+       de  emit-byte
+         fe  emit-byte
+	   ca  emit-byte
+	     8e  emit-byte
+	       be  emit-byte
+        	 ef  emit-byte
+		   fe  emit-byte
+		     ce  emit-byte
+    ]F
+then
+constant moochie
+
+fcode-end
diff --git a/testsuite/TokMisc/VendSpecFCodes b/testsuite/TokMisc/VendSpecFCodes
new file mode 100644
index 0000000..6d4228f
--- /dev/null
+++ b/testsuite/TokMisc/VendSpecFCodes
@@ -0,0 +1,4 @@
+#  Sample of Vendor-Specific FCodes for test
+
+        0x341   Three-for-One,aBargain!
+	0x369   double(lit)    Special-Function pre-defined name
diff --git a/testsuite/TokeErrs/DecodProp.fth b/testsuite/TokeErrs/DecodProp.fth
new file mode 100644
index 0000000..5363e1e
--- /dev/null
+++ b/testsuite/TokeErrs/DecodProp.fth
@@ -0,0 +1,26 @@
+\  Updated Tue, 17 Oct 2006 at 15:32 PDT by David L. Paktor
+
+
+fcode-version2
+
+\  The classic definition, using the return-stack
+[macro] decade-bites  >r over r@ + swap r@ - rot r>
+
+" grubby-nit-picker" device-name
+" bloated lackey of the capitalist toy-mongers"
+    encode-bytes " santa-claus"  property
+
+" name" get-my-property if   ." Sorry, Charlie!"
+else
+    6 decade-bites ."  Starts with:  "  type
+    2drop
+then   cr
+
+
+" santa-claus" get-my-property if   ." Eat flaming death!"
+else
+    7 decode-bytes ."  Starts with:  "  type
+    2drop
+then   cr
+
+fcode-end
diff --git a/testsuite/TokeErrs/DevImbal.fth b/testsuite/TokeErrs/DevImbal.fth
index d84e3bb..27e31bf 100644
--- a/testsuite/TokeErrs/DevImbal.fth
+++ b/testsuite/TokeErrs/DevImbal.fth
@@ -22,7 +22,12 @@ create achin  12 c, 13 c, 14 c,
 new-device
 create eek!  18 c, 17 c, 80 c, 79 c,
 : freek  eek! 4 bounds ?do i c@ . 1 +loop ;
-: greek  -1 if  freek then ;
+: greek
+        recursive -1 if ." By name" greek
+                        ." other name" freek
+        else  ." Re-Curse you!"  recurse
+	then
+;
 [message]  About to access method from parent node
 : hierareek
        eek!
diff --git a/testsuite/TokeErrs/DupNams.fth b/testsuite/TokeErrs/DupNams.fth
index 3be4c66..ce7c4cf 100644
--- a/testsuite/TokeErrs/DupNams.fth
+++ b/testsuite/TokeErrs/DupNams.fth
@@ -1,10 +1,39 @@
 \  Let's make a batch of duplicate definitions in various scopes...
 
-\  Updated Fri, 02 Jun 2006 at 09:48 PDT by David L. Paktor
+\  Updated Thu, 12 Oct 2006 at 13:17 PDT by David L. Paktor
+
+\  Tracing:  alley-oop   boop   croop   doop   drop   dup   foop
+\            gloop   _harpo   hoop   koop   loop   noop   poop
+\            shtoop   zoop
+\            fontbytes    blink-screen    base   bell
+
+\  alley-oop
+\  boop
+\  croop	Global Macro
+\  doop
+\  drop		Built-in word, aliased, invoked
+\  dup		Built-in word
+\  foop 	Global alias to dup
+\  floop	Global Macro, Alias to flop (alias to drop),
+\                   redefined in subordinate device
+\  gloop	Undefined, invoked
+\  _harpo	Local, in subordinate device
+\  hoop
+\  koop
+\  loop		Built-in word
+\  noop 	Built-in word, redefined in second FCode block
+\  poop
+\  shtoop
+\  zoop
+\  fontbytes		Built-in VALUE
+\  blink-screen 	Built-in DEFER
+\  base 		Built-in VARIABLE
+\  bell 		Built-in CONSTANT
+
 
 alias foop dup
 
-[macro] croop  foop message" Using FOOP "
+[macro] croop  foop #message" Using FOOP "
 
 alias dup croop
 
@@ -22,7 +51,8 @@ f[  h# a5519e  constant  {push-locals}  ]f
 global-definitions
 
 alias flop drop
-[macro] floop   flop message" Using FLOOP "
+#message" Sync Up Diffs w/ prev. Release."n"n"
+[macro] floop   flop #message" Using FLOOP "
 alias drop floop
 
 device-definitions
@@ -32,13 +62,15 @@ f[  false constant  o'ryan  ]f
 fcode-version2
 
 : noop  ."  Op?  No!" ;
-[macro] zoop noop message" I Care."
+[macro] zoop noop #message" I Care."
 : poop  h# -21013572  ;
 
     new-device
        : zoop  ." Nothing like the other zoop"  croop ;
        : croop ." Sort of like F-Troop with a higher GPA..."
 	  foop
+	  drop
+	  floop
        ;
        : foop  ." Shop bop-a-looma, a-lop bam boom!" ;
        : floop ." Oh, Jiggly!" ;
@@ -46,6 +78,7 @@ fcode-version2
 	   f[  127 constant _harpo ]f
 	   poop -> _cheeko
 	   f[  _cheeko constant a__gent ]f
+	   floop
        ;
 
        alias droop drop
@@ -59,6 +92,8 @@ fcode-version2
         	_harpo
 		droop
 		drupe
+		boop
+		floop
 	   ;
 	   alias shoop encode-int
 
@@ -73,6 +108,18 @@ fcode-version2
 
        finish-device
 
+       : stoop 
+            floop
+	    gloop
+	    shoop
+       ;
+       alias coop floop
+       : troop
+           shoop
+	   coop
+	   poop
+       ;
+
     finish-device
 start4  \  Let's just stick in an extra, and another error besides...
 fcode-end
diff --git a/testsuite/TokeErrs/MiscFeatErrs.fth b/testsuite/TokeErrs/MiscFeatErrs.fth
index a00ffdd..bc21c04 100644
--- a/testsuite/TokeErrs/MiscFeatErrs.fth
+++ b/testsuite/TokeErrs/MiscFeatErrs.fth
@@ -1,11 +1,17 @@
 \  Obvious pun intended...
-\  Updated Fri, 14 Jul 2006 at 12:50 PDT by David L. Paktor
+\  Updated Mon, 09 Oct 2006 at 09:57 PDT by David L. Paktor
 
 [flag] Local-Values
 f[  ."  This is a test"  ]f
 fcode-version1
 
-fload LocalValuesSupport.fth
+global-definitions
+   headers
+   h# 130 constant  _local-storage-size_
+   headerless
+device-definitions
+
+fload TotalLocalValuesSupport.fth
 noop  noop  noop
 headers
 
@@ -59,10 +65,16 @@ recurse
        _a _b + i * dup -> d
 	  _c * to _e
                  j . loop
+       ['] _a
+      f['] _e
+      f[   f['] _b
+           f['] dup emit-fcode
+	      h# 0f emit-fcode ]f
+      _a _b +  _c *  [']
+          factl catch if ." Run in circles, scream and shout!" then
 ;
 
 
-
 : DMA-ALLOC      ( n -- vaddr )                 " dma-alloc"   $call-parent ;
 : HOOBARTH      ( n -- vaddr )                  " hoobarth"   $call-parent ;
 : MY-END0        ( -- n )              ['] end0         ;
diff --git a/testsuite/TokeErrs/TestArgs b/testsuite/TokeErrs/TestArgs
index 5a8249e..741f8ce 100644
--- a/testsuite/TokeErrs/TestArgs
+++ b/testsuite/TokeErrs/TestArgs
@@ -13,21 +13,26 @@
 #  Most files in this category need the  -i  switch
 #  Some may have additional variants.
 
-#  Updated Thu, 07 Sep 2006 at 11:49 PDT by David L. Paktor
+#  Updated Wed, 18 Oct 2006 at 11:44 PDT by David L. Paktor
 
 MiscFeatErrs , , -i -I. -I..
-LocalTest , NoLvSupp , -i -f Local-Values -I. -I..
-LocalTest , , -i -f Local-Values -I. -I.. -f Always-Headers -d dont_omit_support
-LocalTest1 , ,   -f Local-Values -f noLV-Legacy-Message -I. -I..
+MiscFeatErrs , GLoc , -i -I. -I.. -d Global-Locals
+MiscFeatErrs , LocR , -i -I. -I.. -d Locals-Release
+MiscFeatErrs , GlLr , -i -I. -I.. -d Global-Locals -d Locals-Release
+MiscFeatErrs , Lss  , -i -I. -I.. -d _local-storage-size_=3022
+MiscFeatErrs , NoLss  , -i -I. -I.. -d _local-storage-size_
+LocalTest , NoLvSupp , -i -f Local-Values -I. -I../TokoLoco
+LocalTest , , -i -f Local-Values -I. -I../TokoLoco -f Always-Headers -d dont_omit_support
+LocalTest1 , ,   -f Local-Values -f noLV-Legacy-Message -I. -I../TokoLoco
 ControlMismatch , , -i
-SuppLocErrTest4 , , -i -f Local-Values -l -I. -I..
-testLocDevSupG , , -i -f Local-Values -I. -I..
-testLocDevSupG , SymSiz , -i -f Local-Values -d "_local-storage-size_= d# 120" -I. -I..
+SuppLocErrTest4 , , -i -f Local-Values -l -I. -I../TokoLoco
+testLocDevSupG , , -i -f Local-Values -I. -I../TokoLoco
+testLocDevSupG , SymSiz , -i -f Local-Values -d "_local-storage-size_= d# 120" -I. -I../TokoLoco
 PCIhdrErrs , , -i
 FCShdrErrs , , -i
 PCI_FCShdrErrs , , -i
 CommOvrRun , , -i -l
-LocOvrRun , , -i -f Local-Values -l -I. -I..
+LocOvrRun , , -i -f Local-Values -l -I. -I../TokoLoco
 SplitImbal , , -i -l
 TokCondUnconcF , , -i -l
 TokCondUnconcT , , -i -l
@@ -46,13 +51,13 @@ TooTooLargeBuffer , , -i -l
 UserMacroErrors , , -i
 CStrEscOvflw , , -i -l
 DevImbal , , -i
-DevNodAli , , -i -l -I. -I..
-DevNodAli_01 , , -i -l -I. -I..
-GlobScopErrTst , NoI , -f Local-Values -I. -I..
-GlobScopErrTst , , -i -f Local-Values -I. -I..
-GlobScopErrTst_01 , , -i -f Local-Values -I. -I..
-GlobScopErrTst_02 , , -i -f Local-Values -I. -I..
-GlobScopErrTst_03 , , -i -f Local-Values -I. -I..
+DevNodAli , , -i -l -I. -I../TokoLoco
+DevNodAli_01 , , -i -l -I. -I../TokoLoco
+GlobScopErrTst , NoI , -f Local-Values -I. -I../TokoLoco
+GlobScopErrTst , , -i -f Local-Values -I. -I../TokoLoco
+GlobScopErrTst_01 , , -i -f Local-Values -I. -I../TokoLoco
+GlobScopErrTst_02 , , -i -f Local-Values -I. -I../TokoLoco
+GlobScopErrTst_03 , , -i -f Local-Values -I. -I../TokoLoco
 #  The script-fields below prepare for the  ExpPath InclLst and DePList  tests
 Frinstnce , , -i , touch ExpPath.NoV.{P,f{c,l{,.missing}}}
 Frinstnce , NoI , , chmod a-rw ../TokeCommon/{MyBeerAndYouCannotHaveIt.fth,NoRead.bin} ExpPath.NoV.{P,f{c,l{,.missing}}}
@@ -69,7 +74,7 @@ ExpPath , , -i -l , chmod a+r ../TokeCommon/{MyBeerAndYouCannotHaveIt.fth,NoRead
 
 #  Done with the  ExpPath and  InclLst  tests
 ToAtEnd , , -i
-ToAtEnd , WLocSup , -i -I . -I ..
+ToAtEnd , WLocSup , -i -I . -I ../TokoLoco
 ObsoFCodes , , -i
 ObsoFCodes , NoWarn , -f NoObsolete-FCode-Warning
 
@@ -84,7 +89,7 @@ TooLargeQNoAbort , , -f Local-Values
 AbrtWQuotStr , , -i
 
 #  The new "Trace" feature, and handling of duplicate and mis-scoped names...
-DupNams  , , -f Local-Values -T croop -T drop -T _harpo -T dup -T noop -T zoop -T foop
+DupNams  , , -f Local-Values -T alley-oop -T boop -T croop -T doop -T drop -T dup -T foop -T floop -T gloop -T _harpo -T koop -T loop -T noop -T poop -T shtoop -T zoop -T fontbytes -T blink-screen -T base -T bell
 
 TooManyFCodes , , -l -o TooManyFCodes.fl
 TooManyFCodes , Reg , -i
@@ -98,3 +103,6 @@ MulPCI_LapFC , NoRTwoVal , -i -d NoCrash -d NoReset -d RangeTwo
 
 RetStkDep , , -i
 CondlDefn , , -i
+
+DecodProp
+DecodProp , nrsi , -f noRet-Stk-Interp
diff --git a/testsuite/TokoLoco/GlobalLocalValues.fth b/testsuite/TokoLoco/GlobalLocalValues.fth
index 3c770bd..10e7283 100644
--- a/testsuite/TokoLoco/GlobalLocalValues.fth
+++ b/testsuite/TokoLoco/GlobalLocalValues.fth
@@ -1,6 +1,12 @@
-\  Load Locals Support under Global-Definitions.  Bypass Instance warning
+\  %Z%%M% %I% %W% %G% %U%
+\       (C) Copyright 2005 IBM Corporation.  All Rights Reserved.
+\       Licensed under the Common Public License (CPL) version 1.0
+\       for full details see:
+\            http://www.opensource.org/licenses/cpl1.0.php
+\
+\       Module Author:  David L. Paktor    dlpaktor@us.ibm.com
 
-\  Updated Fri, 10 Mar 2006 at 14:47 PST by David L. Paktor
+\  Load Locals Support under Global-Definitions.  Bypass Instance warning
 
 \  Make sure this option is turned on.
 [flag] Local-Values
diff --git a/testsuite/TokoLoco/GlobalLocalValuesDevel.fth b/testsuite/TokoLoco/GlobalLocalValuesDevel.fth
new file mode 100644
index 0000000..07ea799
--- /dev/null
+++ b/testsuite/TokoLoco/GlobalLocalValuesDevel.fth
@@ -0,0 +1,31 @@
+\  %Z%%M% %I% %W% %G% %U%
+\       (C) Copyright 2005 IBM Corporation.  All Rights Reserved.
+\       Licensed under the Common Public License (CPL) version 1.0
+\       for full details see:
+\            http://www.opensource.org/licenses/cpl1.0.php
+\
+\       Module Author:  David L. Paktor    dlpaktor@us.ibm.com
+
+\  Load Support file for development of FCode that uses Local Values
+\      under Global-Definitions.  Bypass Instance warning.
+\  Replace this with GlobalLocalValues.fth  in your final product.
+
+\  Make sure this option is turned on.
+[flag] Local-Values
+
+global-definitions
+
+\  Bypass warning about Instance without altering LocalValuesSupport file
+alias generic-instance  instance
+[macro] bypass-instance  f[  noop  .( Bypassed instance!) f]
+
+overload alias instance bypass-instance
+
+fload LocalValuesSupport.fth
+fload LocalValuesDevelSupport.fth
+
+\  Replace normal meaning of  Instance, still in Global scope.
+overload alias instance generic-instance
+
+\  Restore Device-Definitions scope.
+device-definitions
diff --git a/testsuite/TokoLoco/LocalValuesDevelSupport.fth b/testsuite/TokoLoco/LocalValuesDevelSupport.fth
new file mode 100644
index 0000000..9aceebf
--- /dev/null
+++ b/testsuite/TokoLoco/LocalValuesDevelSupport.fth
@@ -0,0 +1,46 @@
+\  %Z%%M% %I% %W% %G% %U%
+\       (C) Copyright 2005 IBM Corporation.  All Rights Reserved.
+\       Licensed under the Common Public License (CPL) version 1.0
+\       for full details see:
+\            http://www.opensource.org/licenses/cpl1.0.php
+\
+\       Module Author:  David L. Paktor    dlpaktor@us.ibm.com
+
+\  Support file for development of FCode that uses Local Values
+\  FLoad this right after  LocalValuesSupport.fth
+\  Remove it from your final product.
+
+\  Exported Function:  max-local-storage-size  ( -- n )
+\      Returns the measured maximum size of storage for Local Values
+\      used by any given test run.  This number can be used to guide
+\      the declaration of  _local-storage-size_ 
+\
+\       (C) Copyright 2005 IBM Corporation.  All Rights Reserved.
+\       Module Author:  David L. Paktor    dlpaktor@us.ibm.com
+
+\  Count the current depth on a per-instance basis, 
+\  but collect the maximum depth over all instances.
+
+headers
+0 instance value local-storage-depth
+
+external
+0 value max-local-storage-size
+headers
+
+\  Overload the  {push-locals}  and  {pop-locals}  routines to do this.
+\  Do not suppress the overload warnings; they'll serve as a reminder.
+: {pop-locals} ( #locals -- )
+    local-storage-depth over - to local-storage-depth
+    {pop-locals}
+;
+
+: {push-locals} ( #ilocals #ulocals -- )
+   2dup + local-storage-depth +
+   dup to local-storage-depth
+   max-local-storage-size max
+   to max-local-storage-size
+   {push-locals}
+;
+
+
diff --git a/testsuite/TokoLoco/LocalValuesSupport.fth b/testsuite/TokoLoco/LocalValuesSupport.fth
new file mode 100644
index 0000000..ba05a40
--- /dev/null
+++ b/testsuite/TokoLoco/LocalValuesSupport.fth
@@ -0,0 +1,134 @@
+\  %Z%%M% %I% %W% %G% %U%
+\       (C) Copyright 2005 IBM Corporation.  All Rights Reserved.
+\       Licensed under the Common Public License (CPL) version 1.0
+\       for full details see:
+\            http://www.opensource.org/licenses/cpl1.0.php
+\
+\       Module Author:  David L. Paktor    dlpaktor@us.ibm.com
+
+\  The support routines for Local Values in FCode.
+
+\  Function imported
+\	_local-storage-size_	\  Size, in cells, of backing store for locals
+\	\  A constant.  If not supplied, default value of d# 64 will be used.
+\
+\  Functions exported:
+\	{push-locals}  ( #ilocals #ulocals -- )
+\	{pop-locals}   ( #locals -- )
+\	_{local}       ( local-var# -- addr )
+\
+\  Additional overloaded function:
+\      catch		\  Restore Locals after a  throw
+
+\  The user is responsible for declaring the maximum depth of the
+\      run-time Locals stack, in storage units, by defining the
+\      constant  _local-storage-size_  before floading this file.
+\  The definition may be created either by defining it as a constant
+\      in the startup-file that FLOADs this and other files in the
+\      source program, or via a command-line user-symbol definition
+\      of a form resembling:   -d '_local-storage-size_=d# 42'
+\      (be sure to enclose it within quotes so that the shell treats
+\      it as a single string, and, of course, replace the "42" with
+\      the actual number you need...)
+\  If both forms are present, the command-line user-symbol value will
+\      be used to create a duplicate definition of the named constant,
+\      which will prevail over the earlier definition, and will remain
+\      available for examination during development and testing.  The
+\      duplicate-name warning, which will not be suppressed, will also
+\      act to alert the developer of this condition.
+\  To measure the actual usage (in a test run), use the separate tool
+\      found in the file  LocalValuesDevelSupport.fth .
+\  If the user omits defining  _local-storage-size_  the following
+\      ten-line sequence will supply a default:
+
+[ifdef] _local-storage-size_
+    f[  [defined] _local-storage-size_   true  ]f
+[else]
+    [ifexist] _local-storage-size_
+	f[  false  ]f
+    [else]
+	f[  d# 64   true  ]f
+    [then]
+[then]		( Compile-time:  size true | false )
+[if]   fliteral  constant  _local-storage-size_    [then]
+
+_local-storage-size_    \  The number of storage units to allocate
+  cells                 \    Convert to address units
+  dup                   \    Keep a copy around...
+ ( n )  instance buffer: locals-storage     \  Use one of the copies
+
+\  The Locals Pointer, added to the base address of  locals-storage
+\      points to the base-address of the currently active set of Locals.
+\      Locals will be accessed as a positive offset from there.
+\  Start the Locals Pointer at end of the buffer.
+\  A copy of ( N ), the number of address units that were allocated
+\      for the buffer, is still on the stack.  Use it here.
+ ( n )  instance value locals-pointer
+   
+\  Support for  {push-locals}
+
+\  Error-check.
+: not-enough-locals? ( #ilocals #ulocals -- error? )
+   + cells locals-pointer swap - 0< 
+;
+
+\  Error message.
+: .not-enough-locals ( -- )
+    cr ." FATAL ERROR:  Local Values Usage exceeds allocation." cr
+;
+
+\  Detect, announce and handle error.
+: check-enough-locals ( #ilocals #ulocals -- | <ABORT> )
+    not-enough-locals? if
+        .not-enough-locals
+        abort
+    then
+;
+
+\  The uninitialized locals can be allocated in a single batch
+: push-uninitted-locals ( #ulocals -- )
+    cells locals-pointer swap - to locals-pointer
+;
+
+\  The Initialized locals are initted from the items on top of the stack
+\      at the start of the routine.  If we allocate them one at a time,
+\      we get them into the right order.  I.e., the last-one named gets
+\      the top item, the earlier ones get successively lower items.
+: push-one-initted-local ( pstack-item -- )
+    locals-pointer 1 cells -
+    dup to locals-pointer
+    locals-storage  + !
+;
+
+\  Push all the Initialized locals.
+: push-initted-locals ( N_#ilocals-1 ... N_0 #ilocals -- )
+    0 ?do push-one-initted-local loop
+;
+
+: {push-locals}  ( N_#ilocals ... N_1 #ilocals #ulocals -- )
+    2dup check-enough-locals
+    push-uninitted-locals		( ..... #i )
+    push-initted-locals			(  )
+;
+
+\  Pop all the locals.
+\  The param is the number to pop.
+: {pop-locals} ( total#locals -- )
+    cells locals-pointer + to locals-pointer
+;
+
+\  The address from/to which values will be moved, given the local-var#
+: _{local} ( local-var# -- addr )
+    cells locals-pointer + locals-storage  +
+;
+
+\  We need to overload  catch  such that the state of the Locals Pointer
+\  will be preserved and restored after a  throw .
+overload  : catch ( ??? xt -- ???' false | ???'' throw-code )
+    locals-pointer >r   ( ???  xt )                       ( R: old-locals-ptr )
+    catch               ( ???' false | ???'' throw-code ) ( R: old-locals-ptr )
+    \  No need to inspect the throw-code.
+    \  If  catch  returned a zero, the Locals Pointer
+    \  is valid anyway, so restoring it is harmless.
+    r>  to locals-pointer
+;
diff --git a/testsuite/TokoLoco/TestArgs b/testsuite/TokoLoco/TestArgs
index 300f876..ea1cf4e 100644
--- a/testsuite/TokoLoco/TestArgs
+++ b/testsuite/TokoLoco/TestArgs
@@ -12,18 +12,18 @@
 #  All files in this category need the  -f Local-Values  switch
 #  Some will have additional variants.
 
-#  Updated Mon, 20 Mar 2006 at 11:18 PST by David L. Paktor
+#  Updated Fri, 13 Oct 2006 at 16:19 PDT by David L. Paktor
 
 
-testNest   , ,  -f Local-Values  -l -I. -I..
-SupportedLocalTest  , ,  -f LOCAL-Values  -l -I. -I..
-SupportedLocalTest3  , ,  -f Local-VALUES  -l -I. -I..
-SupportedLocalTest4  , ,  -f Local-Values  -l -I. -I..
-testDevelSupport  , , -f local-values -I. -I..
+testNest   , ,  -f Local-Values  -l
+SupportedLocalTest  , ,  -f LOCAL-Values  -l
+SupportedLocalTest3  , ,  -f Local-VALUES  -l
+SupportedLocalTest4  , ,  -f Local-Values  -l
+testDevelSupport  , , -f local-values
 
 #  Additional variants:
-SupportedLocalTest  , nodupwrn ,  -f Local-VALUES -f NOWarn-if-DUPLicate -l -I. -I..
-SupportedLocalTest  , nolegacy ,  -f LoCAL-VALUes -f NoLV-Legacy-Separator -l -I. -I..
-SupportedLocalTest  , nolgcmsg ,  -f Local-ValUES -f NOLV-LEGAcy-Message -l -I. -I..
-SupportedLocalTest  , nolocals , -i -f noLocal-Values -l -I. -I..
-SupportedLocalTest3  , DefLocStgSiz ,  -f Local-VALUes -d '_loCAL-STORagE-SIZe_=h# 42' -l -I. -I..
+SupportedLocalTest  , nodupwrn ,  -f Local-VALUES -f NOWarn-if-DUPLicate -l
+SupportedLocalTest  , nolegacy ,  -f LoCAL-VALUes -f NoLV-Legacy-Separator -l
+SupportedLocalTest  , nolgcmsg ,  -f Local-ValUES -f NOLV-LEGAcy-Message -l
+SupportedLocalTest  , nolocals , -i -f noLocal-Values -l
+SupportedLocalTest3  , DefLocStgSiz ,  -f Local-VALUes -d '_loCAL-STORagE-SIZe_=h# 42' -l
diff --git a/testsuite/TokoLoco/TotalLocalValuesSupport.fth b/testsuite/TokoLoco/TotalLocalValuesSupport.fth
new file mode 100644
index 0000000..63bb80d
--- /dev/null
+++ b/testsuite/TokoLoco/TotalLocalValuesSupport.fth
@@ -0,0 +1,52 @@
+\  %Z%%M% %I% %W% %G% %U%
+\       (C) Copyright 2005-2006 IBM Corporation.  All Rights Reserved.
+\       Licensed under the Common Public License (CPL) version 1.0
+\       for full details see:
+\            http://www.opensource.org/licenses/cpl1.0.php
+\
+\       Module Author:  David L. Paktor    dlpaktor@us.ibm.com
+
+\  Control file for loading of Local Values Support file with variants.
+\  Command-line Symbol-definitions select whether the support will
+\      be under Global-Definitions, and whether to include the extra
+\      Development-time support features.
+\
+\  The command-line symbols are:
+\            Global-Locals
+\      and
+\            Locals-Release
+\
+\  The default is device-node-specific support in a Development-time setting.
+\
+\  If  Global-Locals  is defined, support will be under Global-Definitions
+\  If  Locals-Release  is defined, this is a final production release run,
+\      and the Development-time support features will be removed.
+
+\  Make sure this option is turned on.
+[flag] Local-Values
+
+[ifdef] Global-Locals
+    \  Load Support file under Global-Definitions.
+    global-definitions
+
+    \  Bypass warning about Instance without altering LocalValuesSupport file
+    alias generic-instance  instance
+    [macro] bypass-instance  f[  noop  .( Bypassed instance!) f]
+
+    overload alias instance bypass-instance
+[endif]  \  Global-Locals
+
+fload LocalValuesSupport.fth
+
+[ifndef] Locals-Release
+    \  Load Development-time support features
+    fload LocalValuesDevelSupport.fth
+[endif]  \  not Locals-Release
+
+[ifdef] Global-Locals
+    \  Replace normal meaning of  Instance, still in Global scope.
+    overload alias instance generic-instance
+
+    \  Restore Device-Definitions scope.
+    device-definitions
+[endif]  \  Global-Locals