--- gforth/kernel/recognizer.fs	2011/10/05 20:48:16	1.1
+++ gforth/kernel/recognizer.fs	2011/10/06 21:17:21	1.12
@@ -15,61 +15,64 @@
 \ 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 , , ;
 
-: r>int     ( r-addr -- )  @ ;
-: r>compint ( r-addr -- )  cell+ @ ;
-: r>comp    ( r-addr -- )  cell+ cell+ @ ;
-: r>lit     ( r-addr -- )  cell+ cell+ cell+ @ ;
+(field) r>int      ( r-addr -- addr )  0 cells ,
+(field) r>comp     ( r-addr -- )       1 cells ,
+(field) r>lit      ( r-addr -- )       2 cells ,
 
 :noname ( ... nt -- ) name>int execute ;
-:noname ( ... nt -- ) name>int compile, ;
 :noname ( ... nt -- ) name>comp execute ;
 :noname ( ... nt -- ) postpone Literal ;
-recognizer: r:int-table
+Create r:word rot A, swap A, A,
 
-:noname ( addr u -- nt int-table true | addr u false )
+: word-recognizer ( addr u -- nt int-table true | addr u false )
     2dup find-name [ [IFDEF] prelude-mask ] run-prelude [ [THEN] ] dup
     IF
-	nip nip r:int-table true  EXIT
-    THEN ; Constant int-recognizer
+	nip nip r:word true  EXIT
+    THEN ;
 
 ' noop
 :noname  postpone Literal ;
 dup
-dup
-recognizer: r:number
+Create r:num rot A, swap A, A,
 
 ' noop
 :noname  postpone 2Literal ;
 dup
-dup
-recognizer: r:2number
+Create r:2num rot A, swap A, A,
+
+\ snumber? should be implemented as recognizer stack
 
-:noname ( addr u -- nt int-table true | addr u false )
+: num-recognizer ( addr u -- n/d int-table true | addr u false )
     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  true  EXIT
     THEN
-    drop 2r> false ; Constant num-recognizer
+    drop 2r> false ;
+
+' no.extensions dup dup Create r:fail A, A, A,
 
 \ 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
 
@@ -77,13 +80,23 @@ num-recognizer int-recognizer 2 forth-re
     dup cell+ swap @ cells bounds ?DO
 	I perform IF  UNLOOP  EXIT  THEN
     cell +LOOP
-    no.extensions ;
+    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 ;
 
 : interpreter-r ( addr u -- ... xt )
-    forth-recognizer do-recognizer r>int ;
+    forth-recognizer do-recognizer r>int @ ;
+
+' interpreter-r IS parser1
 
 : compiler-r ( addr u -- ... xt )
-    forth-recognizer do-recognizer r>comp ;
+    forth-recognizer do-recognizer r>comp @ ;
 
 : [ ( -- ) \  core	left-bracket
     \G Enter interpretation state. Immediate word.
@@ -93,3 +106,12 @@ num-recognizer int-recognizer 2 forth-re
     \G Enter compilation state.
     ['] compiler-r     IS parser1 state on  ;
 
+: >int      ( token table -- )  r>int perform ;
+: >comp     ( token table -- )  r>comp perform ;
+: >postpone ( token table -- )
+    >r r@ r>lit perform r> r>comp @ compile, ;
+
+: postpone ( "name" -- ) \ core
+    \g Compiles the compilation semantics of @i{name}.
+    parse-name forth-recognizer do-recognizer >postpone ; immediate
+