update testsuite to 1.0.2

git-svn-id: svn://coreboot.org/openbios/fcode-utils@107 f158a5a8-5612-0410-a976-696ce0be7e32

Author: Stefan Reinauer

testsuite/TokBrack/TestArgs

@@ -10,11 +10,12 @@
 #          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
 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 

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
+
+
+

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

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

testsuite/TokMisc/AllBiFCTypes.fth

@@ -1,15 +1,14 @@
 \  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",
 \  namely the DEFER and VALUE definitions
 
 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

testsuite/TokMisc/OldTkzr/ContErr0.fth testsuite/TokMisc/ContErr0.fthtestsuite/TokMisc/OldTkzr/ContErr0.fth renamed to testsuite/TokMisc/ContErr0.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

testsuite/TokMisc/ContErr3.fth

@@ -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

testsuite/TokMisc/DtkVSFcTst.scr

@@ -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
 

testsuite/TokMisc/MiscFeatures.DOS.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