--- gforth/kernel/recognizer.fs	2011/10/05 21:17:09	1.6
+++ gforth/kernel/recognizer.fs	2011/12/28 13:39:49	1.15
@@ -15,85 +15,87 @@
 \ interpret it, compile interpretation semantics
 \ compile it, compile it as literal.
 
-: recognizer: ( xt1 xt2 xt3 xt4 -- ) Create 2swap swap 2, swap 2, ;
+: recognizer: ( xt1 xt2 xt3 -- ) Create rot , swap , , ;
 
-(field) r>int     ( r-addr -- addr )  0 cells ,
-(field) r>compint ( r-addr -- )       1 cells ,
-(field) r>comp    ( r-addr -- )       2 cells ,
-(field) r>lit     ( r-addr -- )       3 cells ,
-
-:noname ( ... nt -- ) name>int execute ;
-:noname ( ... nt -- ) name>int compile, ;
-:noname ( ... nt -- ) name>comp execute ;
-:noname ( ... nt -- ) postpone Literal ;
-recognizer: r:interpreter
+(field) r>int      ( r-addr -- addr )  0 cells ,
+(field) r>comp     ( r-addr -- addr )  1 cells ,
+(field) r>lit      ( r-addr -- addr )  2 cells ,
 
-:noname ( addr u -- nt int-table true | addr u false )
+' no.extensions dup dup Create r:fail A, A, A,
+
+: lit, ( n -- ) postpone Literal ;
+: 2lit, ( n -- ) postpone 2Literal ;
+: nt, ( nt -- ) name>comp execute ;
+
+' name>int
+:noname ( ... nt -- ... xt ) ['] nt, ;
+:noname ( ... nt -- xt ) ['] lit, ;
+Create r:word rot A, swap A, A,
+
+: word-recognizer ( addr u -- nt r:word | addr u r:fail )
     2dup find-name [ [IFDEF] prelude-mask ] run-prelude [ [THEN] ] dup
-    IF
-	nip nip r:interpreter true  EXIT
-    THEN ; Constant int-recognizer
+    IF  nip nip r:word  ELSE  drop r:fail  THEN ;
 
-' noop
-:noname  postpone Literal ;
-dup
+:noname  ['] noop ;
+:noname  ['] lit, ;
 dup
-recognizer: r:number
+Create r:num rot A, swap A, A,
 
-' noop
-:noname  postpone 2Literal ;
-dup
+:noname  ['] noop ;
+:noname  ['] 2lit, ;
 dup
-recognizer: r:2number
+Create r:2num rot A, swap A, A,
 
-:noname ( addr u -- nt int-table true | addr u false )
+\ snumber? should be implemented as recognizer stack
+
+: num-recognizer ( addr u -- n/d table | addr u r:fail )
     2dup 2>r snumber?  dup
     IF
-	2rdrop 0> IF  r:2number   ELSE  r:number  THEN  true  EXIT
+	2rdrop 0> IF  r:2num   ELSE  r:num  THEN  EXIT
     THEN
-    drop 2r> false ; Constant num-recognizer
-
-' no.extensions dup 2dup recognizer: r:fail
+    drop 2r> r:fail ;
 
 \ recognizer stack
 
 $10 Constant max-rec#
-Variable forth-recognizer max-rec# cells allot
 
 : get-recognizers ( rec-addr -- xt1 .. xtn n )
-    dup cell+ swap @ dup >r cells bounds ?DO
+    dup swap @ dup >r cells bounds swap ?DO
 	I @
-    cell +LOOP  r> ;
+    cell -LOOP  r> ;
 
 : set-recognizers ( xt1 .. xtn n rec-addr -- )
     over max-rec# u>= abort" Too many recognizers"
-    2dup ! swap cells bounds swap ?DO
+    2dup ! cell+ swap cells bounds ?DO
 	I !
-    cell -LOOP ;
+    cell +LOOP ;
+
+Variable forth-recognizer
 
-num-recognizer int-recognizer 2 forth-recognizer set-recognizers
+' word-recognizer A, ' num-recognizer A, max-rec# 2 - cells allot
+2 forth-recognizer !
+\ ' num-recognizer ' word-recognizer 2 forth-recognizer set-recognizers
 
 \ recognizer loop
 
 : do-recognizer ( addr u rec-addr -- token table )
     dup cell+ swap @ cells bounds ?DO
-	I perform IF  UNLOOP  EXIT  THEN
+	I perform dup r:fail <>  IF  UNLOOP  EXIT  THEN  drop
     cell +LOOP
     r:fail ;
 
 \ nested recognizer helper
 
-: r:table>flag ( table -- table true | false )
-    dup r:fail <> dup 0= IF  nip  THEN ;
-
-\ : nest-recognizer ( addr u -- token table true | addr u false )
-\   xxx-recognizer do-recognizer r:table>flag ;
+\ : nest-recognizer ( addr u -- token table | addr u r:fail )
+\   xxx-recognizer do-recognizer ;
 
 : interpreter-r ( addr u -- ... xt )
-    forth-recognizer do-recognizer r>int @ ;
+    forth-recognizer do-recognizer r>int perform ;
+
+' interpreter-r IS parser1
 
 : compiler-r ( addr u -- ... xt )
-    forth-recognizer do-recognizer r>comp @ ;
+    forth-recognizer do-recognizer r>comp perform ;
 
 : [ ( -- ) \  core	left-bracket
     \G Enter interpretation state. Immediate word.
@@ -103,8 +105,12 @@ num-recognizer int-recognizer 2 forth-re
     \G Enter compilation state.
     ['] compiler-r     IS parser1 state on  ;
 
+: >int      ( token table -- )  r>int perform execute ;
+: >comp     ( token table -- )  r>comp perform execute ;
+: >postpone ( token table -- )
+    >r r@ r>lit perform execute r> r>comp perform compile, ;
+
 : postpone ( "name" -- ) \ core
     \g Compiles the compilation semantics of @i{name}.
-    parse-name forth-recognizer do-recognizer >r
-    r@ r>lit perform r> r>comp @ compile, ; immediate
+    parse-name forth-recognizer do-recognizer >postpone ; immediate