Diff for /gforth/kernel/recognizer.fs between versions 1.7 and 1.16

version 1.7, 2011/10/06 20:04:35 version 1.16, 2012/05/26 12:11:43
Line 18 Line 18
 : recognizer: ( xt1 xt2 xt3 -- ) Create rot , swap , , ;  : recognizer: ( xt1 xt2 xt3 -- ) Create rot , swap , , ;
   
 (field) r>int      ( r-addr -- addr )  0 cells ,  (field) r>int      ( r-addr -- addr )  0 cells ,
 (field) r>comp     ( r-addr -- )       1 cells ,  (field) r>comp     ( r-addr -- addr )  1 cells ,
 (field) r>lit      ( r-addr -- )       2 cells ,  (field) r>lit      ( r-addr -- addr )  2 cells ,
   
 :noname ( ... nt -- ) name>int execute ;  ' no.extensions dup dup Create r:fail A, A, A,
 :noname ( ... nt -- ) name>comp execute ;  
 :noname ( ... nt -- ) postpone Literal ;  : lit, ( n -- ) postpone Literal ;
 Create r:interpreter rot A, swap A, A,  : nt, ( nt -- ) name>comp execute ;
   Variable nt-ex-r
   : nt-ex ( nt -- )  r> nt-ex-r ! name>int execute nt-ex-r @ >r ;
   
   ' nt-ex
   ' nt,
   ' lit,
   Create r:word rot A, swap A, A,
   
 :noname ( addr u -- nt int-table true | addr u false )  : word-recognizer ( addr u -- nt r:word | addr u r:fail )
     2dup find-name [ [IFDEF] prelude-mask ] run-prelude [ [THEN] ] dup      2dup find-name [ [IFDEF] prelude-mask ] run-prelude [ [THEN] ] dup
     IF      IF  nip nip r:word  ELSE  drop r:fail  THEN ;
         nip nip r:interpreter true  EXIT  
     THEN ; Constant int-recognizer  
   
 ' noop  ' noop
 :noname  postpone Literal ;  ' lit,
 dup  dup
 Create r:number rot A, swap A, A,  Create r:num rot A, swap A, A,
   
 ' noop  ' noop
 :noname  postpone 2Literal ;  :noname ( n -- ) postpone 2Literal ;
 dup  dup
 Create r:2number rot A, swap A, A,  Create r:2num rot A, swap A, A,
   
 \ snumber? should be implemented as recognizer stack  \ snumber? should be implemented as recognizer stack
   
 :noname ( addr u -- nt int-table true | addr u false )  : num-recognizer ( addr u -- n/d table | addr u r:fail )
     2dup 2>r snumber?  dup      2dup 2>r snumber?  dup
     IF      IF
         2rdrop 0> IF  r:2number   ELSE  r:number  THEN  true  EXIT          2rdrop 0> IF  r:2num   ELSE  r:num  THEN  EXIT
     THEN      THEN
     drop 2r> false ; Constant num-recognizer      drop 2r> r:fail ;
   
 ' no.extensions dup dup Create r:fail A, A, A,  
   
 \ recognizer stack  \ recognizer stack
   
 $10 Constant max-rec#  $10 Constant max-rec#
   
 : get-recognizers ( rec-addr -- xt1 .. xtn n )  : get-recognizers ( rec-addr -- xt1 .. xtn n )
     dup cell+ swap @ dup >r cells bounds ?DO      dup swap @ dup >r cells bounds swap ?DO
         I @          I @
     cell +LOOP  r> ;      cell -LOOP  r> ;
   
 : set-recognizers ( xt1 .. xtn n rec-addr -- )  : set-recognizers ( xt1 .. xtn n rec-addr -- )
     over max-rec# u>= abort" Too many recognizers"      over max-rec# u>= abort" Too many recognizers"
     2dup ! swap cells bounds swap ?DO      2dup ! cell+ swap cells bounds ?DO
         I !          I !
     cell -LOOP ;      cell +LOOP ;
   
 Variable forth-recognizer  Variable forth-recognizer
   
 int-recognizer A, num-recognizer A, max-rec# 2 - cells allot  ' word-recognizer A, ' num-recognizer A, max-rec# 2 - cells allot
 2 forth-recognizer !  2 forth-recognizer !
 \ num-recognizer int-recognizer 2 forth-recognizer set-recognizers  \ ' num-recognizer ' word-recognizer 2 forth-recognizer set-recognizers
   
 \ recognizer loop  \ recognizer loop
   
 : do-recognizer ( addr u rec-addr -- token table )  : do-recognizer ( addr u rec-addr -- token table )
     dup cell+ swap @ cells bounds ?DO      dup cell+ swap @ cells bounds ?DO
         I perform IF  UNLOOP  EXIT  THEN          I perform dup r:fail <>  IF  UNLOOP  EXIT  THEN  drop
     cell +LOOP      cell +LOOP
     r:fail ;      r:fail ;
   
 \ nested recognizer helper  \ nested recognizer helper
   
 : r:table>flag ( table -- table true | false )  \ : nest-recognizer ( addr u -- token table | addr u r:fail )
     dup r:fail <> dup 0= IF  nip  THEN ;  \   xxx-recognizer do-recognizer ;
   
 \ : nest-recognizer ( addr u -- token table true | addr u false )  
 \   xxx-recognizer do-recognizer r:table>flag ;  
   
 : interpreter-r ( addr u -- ... xt )  : interpreter-r ( addr u -- ... xt )
     forth-recognizer do-recognizer r>int @ ;      forth-recognizer do-recognizer r>int @ ;
Line 106  int-recognizer A, num-recognizer A, max- Line 106  int-recognizer A, num-recognizer A, max-
     \G Enter compilation state.      \G Enter compilation state.
     ['] compiler-r     IS parser1 state on  ;      ['] compiler-r     IS parser1 state on  ;
   
   : >int      ( token table -- )  r>int perform ;
   : >comp     ( token table -- )  r>comp perform ;
 : >postpone ( token table -- )  : >postpone ( token table -- )
     dup r:fail = IF  no.extensions  THEN  
     >r r@ r>lit perform r> r>comp @ compile, ;      >r r@ r>lit perform r> r>comp @ compile, ;
   
 : postpone ( "name" -- ) \ core  : postpone ( "name" -- ) \ core

Removed from v.1.7  
changed lines
  Added in v.1.16


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>