[gforth] / gforth / prims2x.fs  

gforth: gforth/prims2x.fs

Diff for /gforth/prims2x.fs between version 1.59 and 1.85

version 1.59, Tue Dec 26 20:01:49 2000 UTC version 1.85, Tue Feb 27 10:30:02 2001 UTC
Line 19 
Line 19 
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
   
   
 \ This is not very nice (hard limits, no checking, assumes 1 chars = 1)  \ This is not very nice (hard limits, no checking, assumes 1 chars = 1).
   \ And it grew even worse when it aged.
   
 \ Optimizations:  \ Optimizations:
 \ superfluous stores are removed. GCC removes the superfluous loads by itself  \ superfluous stores are removed. GCC removes the superfluous loads by itself
Line 39 
Line 40 
 \ add the store optimization for doubles  \ add the store optimization for doubles
 \ regarding problem 1 above: It would be better (for over) to implement  \ regarding problem 1 above: It would be better (for over) to implement
 \       the alternative  \       the alternative
   \ store optimization for combined instructions.
   \ eliminate stack-cast (no longer used)
   
   \ Design Uglyness:
   
   \ - global state (values, variables) in connection with combined instructions.
   
   \ - index computation is different for instruction-stream and the
   \ stacks; there are two mechanisms for dealing with that
   \ (stack-in-index-xt and a test for stack==instruction-stream); there
   \ should be only one.
   
 warnings off  warnings off
   
Line 49 
Line 61 
 include ./search.fs  include ./search.fs
 include ./extend.fs  include ./extend.fs
 [THEN]  [THEN]
   include ./stuff.fs
   
 [IFUNDEF] environment?  [IFUNDEF] environment?
 include ./environ.fs  include ./environ.fs
Line 58 
Line 71 
   
 include ./gray.fs  include ./gray.fs
   
 100 constant max-effect \ number of things on one side of a stack effect  32 constant max-effect \ number of things on one side of a stack effect
   4 constant max-stacks  \ the max. number of stacks (including inst-stream).
 255 constant maxchar  255 constant maxchar
 maxchar 1+ constant eof-char  maxchar 1+ constant eof-char
 #tab constant tab-char  #tab constant tab-char
Line 68 
Line 82 
 variable endrawinput \ pointer to the end of the input (the char after the last)  variable endrawinput \ pointer to the end of the input (the char after the last)
 variable cookedinput \ pointer to the next char to be parsed  variable cookedinput \ pointer to the next char to be parsed
 variable line \ line number of char pointed to by input  variable line \ line number of char pointed to by input
 1 line !  variable line-start \ pointer to start of current line (for error messages)
   0 line !
 2variable filename \ filename of original input file  2variable filename \ filename of original input file
 0 0 filename 2!  0 0 filename 2!
 2variable f-comment  2variable f-comment
Line 76 
Line 91 
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?  variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
 skipsynclines on  skipsynclines on
   
   : th ( addr1 n -- addr2 )
       cells + ;
   
   : holds ( addr u -- )
       \ like HOLD, but for a string
       tuck + swap 0 +do
           1- dup c@ hold
       loop
       drop ;
   
   : insert-wordlist { c-addr u wordlist xt -- }
       \ adds name "addr u" to wordlist using defining word xt
       \ xt may cause additional stack effects
       get-current >r wordlist set-current
       c-addr u nextname xt execute
       r> set-current ;
   
 : start ( -- addr )  : start ( -- addr )
  cookedinput @ ;   cookedinput @ ;
   
 : end ( addr -- addr u )  : end ( addr -- addr u )
  cookedinput @ over - ;   cookedinput @ over - ;
   
 variable output \ xt ( -- ) of output word  : print-error-line ( -- )
       \ print the current line and position
       line-start @ endrawinput @ over - 2dup nl-char scan drop nip ( start end )
       over - type cr
       line-start @ rawinput @ over - typewhite ." ^" cr ;
   
   : ?print-error { f addr u -- }
       f ?not? if
           outfile-id >r try
               stderr to outfile-id
               filename 2@ type ." :" line @ 0 .r ." : " addr u type cr
               print-error-line
               0
           recover endtry
           r> to outfile-id throw
           abort
       endif ;
   
 : printprim ( -- )  : quote ( -- )
  output @ execute ;      [char] " emit ;
   
   variable output          \ xt ( -- ) of output word for simple primitives
   variable output-combined \ xt ( -- ) of output word for combined primitives
   
 struct%  struct%
       cell%    field stack-number \ the number of this stack
     cell% 2* field stack-pointer \ stackpointer name      cell% 2* field stack-pointer \ stackpointer name
       cell%    field stack-type \ name for default type of stack items
     cell% 2* field stack-cast \ cast string for assignments to stack elements      cell% 2* field stack-cast \ cast string for assignments to stack elements
     cell%    field stack-in-index-xt \ ( in-size item -- in-index )      cell%    field stack-in-index-xt \ ( in-size item -- in-index )
     cell%    field stack-in  \ number of stack items in effect in  
     cell%    field stack-out \ number of stack items in effect out  
 end-struct stack%  end-struct stack%
   
 struct%  struct%
Line 100 
Line 151 
  cell%    field item-stack  \ descriptor for the stack used, 0 is default   cell%    field item-stack  \ descriptor for the stack used, 0 is default
  cell%    field item-type   \ descriptor for the item type   cell%    field item-type   \ descriptor for the item type
  cell%    field item-offset \ offset in stack items, 0 for the deepest element   cell%    field item-offset \ offset in stack items, 0 for the deepest element
    cell%    field item-first  \ true if this is the first occurence of the item
 end-struct item%  end-struct item%
   
 struct%  struct%
Line 110 
Line 162 
     cell%    field type-store \ xt of store code generator ( item -- )      cell%    field type-store \ xt of store code generator ( item -- )
 end-struct type%  end-struct type%
   
   variable next-stack-number 0 next-stack-number !
   create stacks max-stacks cells allot \ array of stacks
   
 : stack-in-index ( in-size item -- in-index )  : stack-in-index ( in-size item -- in-index )
     item-offset @ - 1- ;      item-offset @ - 1- ;
   
 : inst-in-index ( in-size item -- in-index )  : inst-in-index ( in-size item -- in-index )
     nip dup item-offset @ swap item-type @ type-size @ + 1- ;      nip dup item-offset @ swap item-type @ type-size @ + 1- ;
   
 : make-stack ( addr-ptr u1 addr-cast u2 "stack-name" -- )  : make-stack ( addr-ptr u1 type addr-cast u2 "stack-name" -- )
     create stack% %allot >r      create stack% %allot >r
       r@ stacks next-stack-number @ th !
       next-stack-number @ r@ stack-number !  1 next-stack-number +!
     save-mem r@ stack-cast 2!      save-mem r@ stack-cast 2!
       r@ stack-type !
     save-mem r@ stack-pointer 2!      save-mem r@ stack-pointer 2!
     ['] stack-in-index r> stack-in-index-xt ! ;      ['] stack-in-index r> stack-in-index-xt ! ;
   
 s" sp" save-mem s" (Cell)" make-stack data-stack  
 s" fp" save-mem s" "       make-stack fp-stack  
 s" rp" save-mem s" (Cell)" make-stack return-stack  
 s" ip" save-mem s" error don't use # on results" make-stack inst-stream  
 ' inst-in-index inst-stream stack-in-index-xt !  
 \ !! initialize stack-in and stack-out  
   
 \ stack items  \ stack items
   
 : init-item ( addr u addr1 -- )  : init-item ( addr u addr1 -- )
Line 137 
Line 188 
     dup item% %size erase      dup item% %size erase
     item-name 2! ;      item-name 2! ;
   
   : map-items { addr end xt -- }
       \ perform xt for all items in array addr...end
       end addr ?do
           i xt execute
       item% %size +loop ;
   
   \ types
   
   : print-type-prefix ( type -- )
       body> >head name>string type ;
   
 \ various variables for storing stuff of one primitive  \ various variables for storing stuff of one primitive
   
 2variable forth-name  struct%
 2variable wordset      cell% 2* field prim-name
 2variable c-name      cell% 2* field prim-wordset
 2variable doc      cell% 2* field prim-c-name
 2variable c-code      cell% 2* field prim-doc
 2variable forth-code      cell% 2* field prim-c-code
 2variable stack-string      cell% 2* field prim-forth-code
 create effect-in  max-effect item% %size * allot      cell% 2* field prim-stack-string
 create effect-out max-effect item% %size * allot      cell%    field prim-num            \ ordinal number
 variable effect-in-end ( pointer )      cell%    field prim-items-wordlist \ unique items
 variable effect-out-end ( pointer )      item% max-effect * field prim-effect-in
       item% max-effect * field prim-effect-out
       cell%    field prim-effect-in-end
       cell%    field prim-effect-out-end
       cell% max-stacks * field prim-stacks-in  \ number of in items per stack
       cell% max-stacks * field prim-stacks-out \ number of out items per stack
   end-struct prim%
   
   : make-prim ( -- prim )
       prim% %alloc { p }
       s" " p prim-doc 2! s" " p prim-forth-code 2! s" " p prim-wordset 2!
       p ;
   
   0 value prim     \ in combined prims either combined or a part
   0 value combined \ in combined prims the combined prim
   variable in-part \ true if processing a part
    in-part off
   
   1000 constant max-combined
   create combined-prims max-combined cells allot
   variable num-combined
   
   table constant combinations
     \ the keys are the sequences of pointers to primitives
   
   create current-depth max-stacks cells allot
   create max-depth     max-stacks cells allot
   create min-depth     max-stacks cells allot
   
   wordlist constant primitives
   
   : create-prim ( prim -- )
       dup prim-name 2@ primitives ['] constant insert-wordlist ;
   
   : stack-in ( stack -- addr )
       \ address of number of stack items in effect in
       stack-number @ cells prim prim-stacks-in + ;
   
   : stack-out ( stack -- addr )
       \ address of number of stack items in effect out
       stack-number @ cells prim prim-stacks-out + ;
   
   \ global vars
 variable c-line  variable c-line
 2variable c-filename  2variable c-filename
 variable name-line  variable name-line
 2variable name-filename  2variable name-filename
 2variable last-name-filename  2variable last-name-filename
   
 variable primitive-number -10 primitive-number !  
 Variable function-number 0 function-number !  Variable function-number 0 function-number !
   
 \ for several reasons stack items of a word are stored in a wordlist  
 \ since neither forget nor marker are implemented yet, we make a new  
 \ wordlist for every word and store it in the variable items  
 variable items  
   
 \ a few more set ops  \ a few more set ops
   
 : bit-equivalent ( w1 w2 -- w3 )  : bit-equivalent ( w1 w2 -- w3 )
Line 172 
Line 269 
 : complement ( set1 -- set2 )  : complement ( set1 -- set2 )
  empty ['] bit-equivalent binary-set-operation ;   empty ['] bit-equivalent binary-set-operation ;
   
 \ the parser  \ stack access stuff
   
 eof-char max-member \ the whole character set + EOF  : normal-stack-access ( n stack -- )
       stack-pointer 2@ type
 : getinput ( -- n )      dup
  rawinput @ endrawinput @ =  
  if   if
    eof-char          ." [" 0 .r ." ]"
  else  
    cookedinput @ c@  
  endif ;  
   
 :noname ( n -- )  
  dup bl > if  
   emit space  
  else   else
   .          drop ." TOS"
  endif ;   endif ;
 print-token !  
   
 : testchar? ( set -- f )  \ forward declaration for inst-stream (breaks cycle in definitions)
  getinput member? ;  defer inst-stream-f ( -- stack )
 ' testchar? test-vector !  
   
 : checksyncline ( -- )  : part-stack-access { n stack -- }
     \ when input points to a newline, check if the next line is a      \ print _<stack><x>, x=inst-stream? n : maxdepth-currentdepth-n-1
     \ sync line.  If it is, perform the appropriate actions.      ." _" stack stack-pointer 2@ type
     rawinput @ >r      stack stack-number @ { stack# }
     s" #line " r@ over compare 0<> if      current-depth stack# th @ n + { access-depth }
         rdrop 1 line +! EXIT      stack inst-stream-f = if
     endif          access-depth
     0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )      else
     dup c@ bl = if          combined prim-stacks-in stack# th @
         char+ dup c@ [char] " <> abort" sync line syntax"          assert( dup max-depth stack# th @ = )
         char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!          access-depth - 1-
         char+  
     endif  
     dup c@ nl-char <> abort" sync line syntax"  
     skipsynclines @ if  
         dup char+ rawinput !  
         rawinput @ c@ cookedinput @ c!  
     endif  
     drop ;  
   
 : ?nextchar ( f -- )  
     ?not? if  
         filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"  
         getinput . cr  
         rawinput @ endrawinput @ over - 100 min type cr  
         abort  
     endif  
     rawinput @ endrawinput @ <> if  
         rawinput @ c@  
         1 chars rawinput +!  
         1 chars cookedinput +!  
         nl-char = if  
             checksyncline  
         endif          endif
         rawinput @ c@ cookedinput @ c!      0 .r ;
     endif ;  
   
 : charclass ( set "name" -- )  
  ['] ?nextchar terminal ;  
   
 : .. ( c1 c2 -- set )  
  ( creates a set that includes the characters c, c1<=c<=c2 )  
  empty copy-set  
  swap 1+ rot do  
   i over add-member  
  loop ;  
   
 : ` ( -- terminal ) ( use: ` c )  
  ( creates anonymous terminal for the character c )  
  char singleton ['] ?nextchar make-terminal ;  
   
 char a char z ..  char A char Z ..  union char _ singleton union  charclass letter  
 char 0 char 9 ..                                        charclass digit  
 bl singleton tab-char over add-member                   charclass white  
 nl-char singleton eof-char over add-member complement   charclass nonl  
 nl-char singleton eof-char over add-member  
     char : over add-member complement                   charclass nocolonnl  
 bl 1+ maxchar .. char \ singleton complement intersection  
                                                         charclass nowhitebq  
 bl 1+ maxchar ..                                        charclass nowhite  
 char " singleton eof-char over add-member complement    charclass noquote  
 nl-char singleton                                       charclass nl  
 eof-char singleton                                      charclass eof  
   
   
 (( letter (( letter || digit )) **  
 )) <- c-ident ( -- )  
   
 (( ` # ?? (( letter || digit || ` : )) **  
 )) <- stack-ident ( -- )  
   
 (( nowhitebq nowhite ** ))  
 <- forth-ident ( -- )  
   
 Variable forth-flag  
 Variable c-flag  
   
 (( (( ` e || ` E )) {{ start }} nonl **  
    {{ end evaluate }}  
 )) <- eval-comment ( ... -- ... )  
   
 (( (( ` f || ` F )) {{ start }} nonl **  
    {{ end forth-flag @ IF type cr ELSE 2drop THEN }}  
 )) <- forth-comment ( -- )  
   
 (( (( ` c || ` C )) {{ start }} nonl **  
    {{ end c-flag @ IF type cr ELSE 2drop THEN }}  
 )) <- c-comment ( -- )  
   
 (( ` - nonl ** {{  
         forth-flag @ IF ." [ELSE]" cr THEN  
         c-flag @ IF ." #else" cr THEN }}  
 )) <- else-comment  
   
 (( ` + {{ start }} nonl ** {{ end  
         dup  
         IF      c-flag @  
                 IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr  
                 THEN  
                 forth-flag @  
                 IF  ." has? " type ."  [IF]"  cr THEN  
         ELSE    2drop  
             c-flag @      IF  ." #endif"  cr THEN  
             forth-flag @  IF  ." [THEN]"  cr THEN  
         THEN }}  
 )) <- if-comment  
   
 (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body  
   
 (( ` \ comment-body nl )) <- comment ( -- )  
   
 (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **  
 <- stack-items  
   
 (( {{ effect-in }}  stack-items {{ effect-in-end ! }}  
    ` - ` - white **  
    {{ effect-out }} stack-items {{ effect-out-end ! }}  
 )) <- stack-effect ( -- )  
   
 (( {{ s" " doc 2! s" " forth-code 2! s" " wordset 2! }}  
    (( {{ line @ name-line ! filename 2@ name-filename 2! }}  
       {{ start }} forth-ident {{ end 2dup forth-name 2! c-name 2! }}  white ++  
       ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **  
         (( {{ start }} forth-ident {{ end wordset 2! }} white **  
            (( {{ start }}  c-ident {{ end c-name 2! }} )) ??  
         )) ??  nl  
    ))  
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " white ** nl )) ??  
    {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end c-code 2! skipsynclines on }}  
    (( ` :  white ** nl  
       {{ start }} (( nonl ++  nl white ** )) ++ {{ end forth-code 2! }}  
    )) ?? {{ printprim }}  
    (( nl || eof ))  
 )) <- primitive ( -- )  
   
 (( (( comment || primitive || nl white ** )) ** eof ))  
 parser primitives2something  
 warnings @ [IF]  
 .( parser generated ok ) cr  
 [THEN]  
   
 : primfilter ( file-id xt -- )  
 \ fileid is for the input file, xt ( -- ) is for the output word  
  output !  
  here dup rawinput ! cookedinput !  
  here unused rot read-file throw  
  dup here + endrawinput !  
  allot  
  align  
  checksyncline  
 \ begin  
 \     getinput dup eof-char = ?EXIT emit true ?nextchar  
 \ again ;  
  primitives2something ;  
   
 \ types  
   
 : stack-access ( n stack -- )  : stack-access ( n stack -- )
     \ print a stack access at index n of stack      \ print a stack access at index n of stack
     stack-pointer 2@ type      in-part @ if
     dup          part-stack-access
     if  
         ." [" 0 .r ." ]"  
     else      else
         drop ." TOS"          normal-stack-access
     endif ;      endif ;
   
 : item-in-index { item -- n }  : item-in-index { item -- n }
Line 368 
Line 310 
     item item-stack @ dup >r stack-in @ ( in-size r:stack )      item item-stack @ dup >r stack-in @ ( in-size r:stack )
     item r> stack-in-index-xt @ execute ;      item r> stack-in-index-xt @ execute ;
   
   : item-stack-type-name ( item -- addr u )
       item-stack @ stack-type @ type-c-name 2@ ;
   
 : fetch-single ( item -- )  : fetch-single ( item -- )
  \ fetch a single stack item from its stack   \ fetch a single stack item from its stack
  >r   >r
  r@ item-name 2@ type   r@ item-name 2@ type
  ."  = ("   ."  = vm_" r@ item-stack-type-name type
  r@ item-type @ type-c-name 2@ type ." ) "   ." 2" r@ item-type @ print-type-prefix ." ("
  r@ item-in-index r@ item-stack @ stack-access   r@ item-in-index r@ item-stack @ stack-access
  ." ;" cr   ." );" cr
  rdrop ;   rdrop ;
   
 : fetch-double ( item -- )  : fetch-double ( item -- )
  \ fetch a double stack item from its stack   \ fetch a double stack item from its stack
  >r   >r
  ." FETCH_DCELL("   ." vm_two"
    r@ item-stack-type-name type ." 2"
    r@ item-type @ print-type-prefix ." ("
  r@ item-name 2@ type ." , "   r@ item-name 2@ type ." , "
  r@ item-in-index r@ item-stack @ 2dup stack-access   r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access
  ." , "                      -1 under+ stack-access   ." , "                      -1 under+ ." (Cell)" stack-access
  ." );" cr   ." );" cr
  rdrop ;   rdrop ;
   
 : same-as-in? ( item -- f )  : same-as-in? ( item -- f )
  \ f is true iff the offset and stack of item is the same as on input   \ f is true iff the offset and stack of item is the same as on input
  >r   >r
  r@ item-name 2@ items @ search-wordlist 0=   r@ item-first @ if
  abort" bug"       rdrop false exit
    endif
    r@ item-name 2@ prim prim-items-wordlist @ search-wordlist 0= abort" bug"
  execute @   execute @
  dup r@ =   dup r@ =
  if \ item first appeared in output   if \ item first appeared in output
Line 409 
Line 358 
   
 : really-store-single ( item -- )  : really-store-single ( item -- )
  >r   >r
  r@ item-out-index r@ item-stack @ stack-access ."  = "   r@ item-out-index r@ item-stack @ stack-access ."  = vm_"
  r@ item-stack @ stack-cast 2@ type   r@ item-type @ print-type-prefix ." 2"
  r@ item-name 2@ type ." ;"   r@ item-stack-type-name type ." ("
    r@ item-name 2@ type ." );"
  rdrop ;   rdrop ;
   
 : store-single ( item -- )  : store-single ( item -- )
Line 431 
Line 381 
 : store-double ( item -- )  : store-double ( item -- )
 \ !! store optimization is not performed, because it is not yet needed  \ !! store optimization is not performed, because it is not yet needed
  >r   >r
  ." STORE_DCELL(" r@ item-name 2@ type ." , "   ." vm_"
    r@ item-type @ print-type-prefix ." 2two"
    r@ item-stack-type-name type ." ("
    r@ item-name 2@ type ." , "
  r@ item-out-index r@ item-stack @ 2dup stack-access   r@ item-out-index r@ item-stack @ 2dup stack-access
  ." , "                       -1 under+ stack-access   ." , "                       -1 under+ stack-access
  ." );" cr   ." );" cr
Line 479 
Line 432 
     { item typ }      { item typ }
     typ item item-type !      typ item item-type !
     typ type-stack @ item item-stack !default      typ type-stack @ item item-stack !default
     item item-name 2@ items @ search-wordlist 0= if \ new name      item item-name 2@ prim prim-items-wordlist @ search-wordlist 0= if
         item item-name 2@ 2dup nextname item declare          item item-name 2@ nextname item declare
         typ type-c-name 2@ type space type  ." ;" cr          item item-first on
           \ typ type-c-name 2@ type space type  ." ;" cr
     else      else
         drop          drop
           item item-first off
     endif ;      endif ;
   
 : execute-prefix ( item addr1 u1 -- )  : execute-prefix ( item addr1 u1 -- )
Line 497 
Line 452 
         endif          endif
         -1 s+loop          -1 s+loop
     \ we did not find a type, abort      \ we did not find a type, abort
     true abort" unknown prefix" ;      false s" unknown prefix" ?print-error ;
   
 : declaration ( item -- )  : declaration ( item -- )
     dup item-name 2@ execute-prefix ;      dup item-name 2@ execute-prefix ;
   
   : declaration-list ( addr1 addr2 -- )
       ['] declaration map-items ;
   
   : declarations ( -- )
    wordlist dup prim prim-items-wordlist ! set-current
    prim prim-effect-in prim prim-effect-in-end @ declaration-list
    prim prim-effect-out prim prim-effect-out-end @ declaration-list ;
   
   : print-declaration { item -- }
       item item-first @ if
           item item-type @ type-c-name 2@ type space
           item item-name 2@ type ." ;" cr
       endif ;
   
   : print-declarations ( -- )
       prim prim-effect-in  prim prim-effect-in-end  @ ['] print-declaration map-items
       prim prim-effect-out prim prim-effect-out-end @ ['] print-declaration map-items ;
   
 : stack-prefix ( stack "prefix" -- )  : stack-prefix ( stack "prefix" -- )
     name tuck nextname create ( stack length ) 2,      name tuck nextname create ( stack length ) 2,
 does> ( item -- )  does> ( item -- )
Line 510 
Line 483 
     stack item item-stack !      stack item item-stack !
     item declaration ;      item declaration ;
   
 : declaration-list ( addr1 addr2 -- )  \ types pointed to by stacks for use in combined prims
  swap ?do  \ !! output-c-combined shouldn't use these names!
   i declaration  s" Cell"  single 0 create-type w
  item% %size +loop ;  s" Float" single 0 create-type r
   
 : declarations ( -- )  s" sp" save-mem w s" (Cell)" make-stack data-stack
  wordlist dup items ! set-current  s" fp" save-mem r s" "       make-stack fp-stack
  effect-in effect-in-end @ declaration-list  s" rp" save-mem w s" (Cell)" make-stack return-stack
  effect-out effect-out-end @ declaration-list ;  s" IP" save-mem w s" error don't use # on results" make-stack inst-stream
   ' inst-in-index inst-stream stack-in-index-xt !
   ' inst-stream <is> inst-stream-f
   \ !! initialize stack-in and stack-out
   
 \ offset computation  \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0  \ the leftmost (i.e. deepest) item has offset 0
Line 530 
Line 506 
     item item-stack @ xt execute dup @ >r +!      item item-stack @ xt execute dup @ >r +!
     r> item item-offset ! ;      r> item item-offset ! ;
   
 : compute-list ( addr1 addr2 xt -- )  : compute-offset-in ( addr1 addr2 -- )
     { xt }      ['] stack-in compute-offset ;
     swap u+do  
         i xt compute-offset  : compute-offset-out ( addr1 addr2 -- )
     item% %size +loop ;      ['] stack-out compute-offset ;
   
 : clear-stack { -- }  : clear-stack { -- }
     dup stack-in off stack-out off ;      dup stack-in off stack-out off ;
Line 542 
Line 518 
 : compute-offsets ( -- )  : compute-offsets ( -- )
     data-stack clear-stack  fp-stack clear-stack return-stack clear-stack      data-stack clear-stack  fp-stack clear-stack return-stack clear-stack
     inst-stream clear-stack      inst-stream clear-stack
     effect-in  effect-in-end  @ ['] stack-in  compute-list      prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items
     effect-out effect-out-end @ ['] stack-out compute-list      prim prim-effect-out prim prim-effect-out-end @ ['] compute-offset-out map-items
     inst-stream stack-out @ 0<> abort" # can only be on the input side" ;      inst-stream stack-out @ 0= s" # can only be on the input side" ?print-error ;
   
   : process-simple ( -- )
       prim prim { W^ key } key cell
       combinations ['] constant insert-wordlist
       declarations compute-offsets
       output @ execute ;
   
 : flush-a-tos { stack -- }  : flush-a-tos { stack -- }
     stack stack-out @ 0<> stack stack-in @ 0= and      stack stack-out @ 0<> stack stack-in @ 0= and
Line 575 
Line 557 
  dup item-type @ type-fetch @ execute ;   dup item-type @ type-fetch @ execute ;
   
 : fetches ( -- )  : fetches ( -- )
  effect-in-end @ effect-in ?do      prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
    i fetch  
  item% %size +loop ;  
   
 : stack-pointer-update { stack -- }  : stack-pointer-update { stack -- }
     \ stack grow downwards      \ stack grow downwards
Line 603 
Line 583 
  dup item-type @ type-store @ execute ;   dup item-type @ type-store @ execute ;
   
 : stores ( -- )  : stores ( -- )
  effect-out-end @ effect-out ?do      prim prim-effect-out prim prim-effect-out-end @ ['] store map-items ;
    i store  
  item% %size +loop ;  
   
 : output-c-tail ( -- )  : output-c-tail ( -- )
     \ the final part of the generated C code      \ the final part of the generated C code
     ." NEXT_P1;" cr      ." NEXT_P1;" cr
     stores      stores
     fill-tos      fill-tos
     ." NEXT_P2;" cr ;      ." NEXT_P2;" ;
   
 : type-c ( c-addr u -- )  : type-c-code ( c-addr u xt -- )
     \ like TYPE, but replaces "TAIL;" with tail code      \ like TYPE, but replaces "TAIL;" with tail code produced by xt
       { xt }
     begin ( c-addr1 u1 )      begin ( c-addr1 u1 )
         2dup s" TAIL;" search          2dup s" TAIL;" search
     while ( c-addr1 u1 c-addr3 u3 )      while ( c-addr1 u1 c-addr3 u3 )
         2dup 2>r drop nip over - type          2dup 2>r drop nip over - type
         output-c-tail          xt execute
         2r> 5 /string          2r> 5 /string
         \ !! resync #line missing          \ !! resync #line missing
     repeat      repeat
     2drop type ;      2drop type ;
   
   : print-debug-arg { item -- }
       ." fputs(" quote space item item-name 2@ type ." =" quote ." , vm_out); "
       ." printarg_" item item-type @ print-type-prefix
       ." (" item item-name 2@ type ." );" cr ;
   
   : print-debug-args ( -- )
       ." #ifdef VM_DEBUG" cr
       ." if (vm_debug) {" cr
       prim prim-effect-in prim prim-effect-in-end @ ['] print-debug-arg map-items
       ." fputc('\n', vm_out);" cr
       ." }" cr
       ." #endif" cr ;
   
   : print-entry ( -- )
       ." I_" prim prim-c-name 2@ type ." :" ;
   
 : output-c ( -- )  : output-c ( -- )
  ." I_" c-name 2@ type ." :     /* " forth-name 2@ type ."  ( " stack-string 2@ type ." ) */" cr   print-entry ."  /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
  ." /* " doc 2@ type ."  */" cr   ." /* " prim prim-doc 2@ type ."  */" cr
  ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging   ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
  ." {" cr   ." {" cr
  ." DEF_CA" cr   ." DEF_CA" cr
  declarations   print-declarations
  compute-offsets \ for everything else  
  ." NEXT_P0;" cr   ." NEXT_P0;" cr
  flush-tos   flush-tos
  fetches   fetches
    print-debug-args
  stack-pointer-updates   stack-pointer-updates
  ." {" cr   ." {" cr
  ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr   ." #line " c-line @ . quote c-filename 2@ type quote cr
  c-code 2@ type-c   prim prim-c-code 2@ ['] output-c-tail type-c-code
  ." }" cr   ." }" cr
  output-c-tail   output-c-tail
  ." }" cr   ." }" cr
  cr   cr
 ;  ;
   
 : print-type-prefix ( type -- )  
     body> >head .name ;  
   
 : disasm-arg { item -- }  : disasm-arg { item -- }
     item item-stack @ inst-stream = if      item item-stack @ inst-stream = if
           ."   fputc(' ', vm_out); "
         ."   printarg_" item item-type @ print-type-prefix          ."   printarg_" item item-type @ print-type-prefix
         ." (ip[" item item-offset @ 1+ 0 .r ." ]);" cr          ." ((" item item-type @ type-c-name 2@ type ." )"
           ." ip[" item item-offset @ 1+ 0 .r ." ]);" cr
     endif ;      endif ;
   
 : disasm-args ( -- )  : disasm-args ( -- )
  effect-in-end @ effect-in ?do      prim prim-effect-in prim prim-effect-in-end @ ['] disasm-arg map-items ;
    i disasm-arg  
  item% %size +loop ;  
   
 : output-disasm ( -- )  : output-disasm ( -- )
     \ generate code for disassembling VM instructions      \ generate code for disassembling VM instructions
     ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr      ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr
     ."   fputs(" [char] " emit forth-name 2@ type [char] " emit ." ,stdout);" cr      ."   fputs(" quote prim prim-name 2@ type quote ." , vm_out);" cr
     ." /* " declarations ." */" cr  
     compute-offsets  
     disasm-args      disasm-args
     ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr      ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
     ." } else "      ." } else " ;
     1 function-number +! ;  
   : gen-arg-parm { item -- }
       item item-stack @ inst-stream = if
           ." , " item item-type @ type-c-name 2@ type space
           item item-name 2@ type
       endif ;
   
   : gen-args-parm ( -- )
       prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-parm map-items ;
   
   : gen-arg-gen { item -- }
       item item-stack @ inst-stream = if
           ."   genarg_" item item-type @ print-type-prefix
           ." (ctp, " item item-name 2@ type ." );" cr
       endif ;
   
   : gen-args-gen ( -- )
       prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-gen map-items ;
   
   : output-gen ( -- )
       \ generate C code for generating VM instructions
       ." void gen_" prim prim-c-name 2@ type ." (Inst **ctp" gen-args-parm ." )" cr
       ." {" cr
       ."   gen_inst(ctp, vm_prim[" function-number @ 0 .r ." ]);" cr
       gen-args-gen
       ." }" cr ;
   
 : stack-used? { stack -- f }  : stack-used? { stack -- f }
     stack stack-in @ stack stack-out @ or 0<> ;      stack stack-in @ stack stack-out @ or 0<> ;
   
 : output-funclabel ( -- )  : output-funclabel ( -- )
   1 function-number +!    ." &I_" prim prim-c-name 2@ type ." ," cr ;
   ." &I_" c-name 2@ type ." ," cr ;  
   
 : output-forthname ( -- )  : output-forthname ( -- )
   1 function-number +!    '" emit prim prim-name 2@ type '" emit ." ," cr ;
   '" emit forth-name 2@ type '" emit ." ," cr ;  
   
 : output-c-func ( -- )  : output-c-func ( -- )
 \ used for word libraries  \ used for word libraries
     1 function-number +!      ." Cell * I_" prim prim-c-name 2@ type ." (Cell *SP, Cell **FP)      /* " prim prim-name 2@ type
     ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type      ."  ( " prim prim-stack-string 2@ type ."  ) */" cr
     ."  ( " stack-string 2@ type ."  ) */" cr      ." /* " prim prim-doc 2@ type ."  */" cr
     ." /* " doc 2@ type ."  */" cr      ." NAME(" quote prim prim-name 2@ type quote ." )" cr
     ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr  
     \ debugging      \ debugging
     ." {" cr      ." {" cr
     declarations      print-declarations
     compute-offsets \ for everything else  
     inst-stream  stack-used? IF ." Cell *ip=IP;" cr THEN      inst-stream  stack-used? IF ." Cell *ip=IP;" cr THEN
     data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN      data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN
     fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN      fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN
Line 703 
Line 714 
     stack-pointer-updates      stack-pointer-updates
     fp-stack   stack-used? IF ." *FP=fp;" cr THEN      fp-stack   stack-used? IF ." *FP=fp;" cr THEN
     ." {" cr      ." {" cr
     ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr      ." #line " c-line @ . quote c-filename 2@ type quote cr
     c-code 2@ type      prim prim-c-code 2@ type
     ." }" cr      ." }" cr
     stores      stores
     fill-tos      fill-tos
Line 713 
Line 724 
     cr ;      cr ;
   
 : output-label ( -- )  : output-label ( -- )
     ." (Label)&&I_" c-name 2@ type ." ," cr      ." (Label)&&I_" prim prim-c-name 2@ type ." ," cr ;
     -1 primitive-number +! ;  
   
 : output-alias ( -- )  : output-alias ( -- )
     ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr      ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
     -1 primitive-number +! ;  
   
 : output-forth ( -- )  : output-forth ( -- )
     forth-code @ 0=      prim prim-forth-code @ 0=
     IF          \ output-alias      IF          \ output-alias
         \ this is bad for ec: an alias is compiled if tho word does not exist!          \ this is bad for ec: an alias is compiled if tho word does not exist!
         \ JAW          \ JAW
     ELSE  ." : " forth-name 2@ type ."   ( "      ELSE  ." : " prim prim-name 2@ type ."   ( "
         stack-string 2@ type ." )" cr          prim prim-stack-string 2@ type ." )" cr
         forth-code 2@ type cr          prim prim-forth-code 2@ type cr
         -1 primitive-number +!  
     THEN ;      THEN ;
   
 : output-tag-file ( -- )  : output-tag-file ( -- )
Line 741 
Line 749 
   
 : output-tag ( -- )  : output-tag ( -- )
     output-tag-file      output-tag-file
     forth-name 2@ 1+ type      prim prim-name 2@ 1+ type
     127 emit      127 emit
     space forth-name 2@ type space      space prim prim-name 2@ type space
     1 emit      1 emit
     name-line @ 0 .r      name-line @ 0 .r
     ." ,0" cr ;      ." ,0" cr ;
   
 [IFDEF] documentation  [IFDEF] documentation
 : register-doc ( -- )  : register-doc ( -- )
     get-current documentation set-current      prim prim-name 2@ documentation ['] create insert-wordlist
     forth-name 2@ nextname create      prim prim-name 2@ 2,
     forth-name 2@ 2,      prim prim-stack-string 2@ condition-stack-effect 2,
     stack-string 2@ condition-stack-effect 2,      prim prim-wordset 2@ 2,
     wordset 2@ 2,      prim prim-c-name 2@ condition-pronounciation 2,
     c-name 2@ condition-pronounciation 2,      prim prim-doc 2@ 2, ;
     doc 2@ 2,  
     set-current ;  
 [THEN]  [THEN]
   
 : process-file ( addr u xt -- )  
     >r  \ combining instructions
     2dup filename 2!  
     0 function-number !  \ The input should look like this:
     r/o open-file abort" cannot open file"  
   \ lit_+ = lit +
   
   \ The output should look like this:
   
   \  I_lit_+:
   \  {
   \  DEF_CA
   \  Cell _x_ip0;
   \  Cell _x_sp0;
   \  Cell _x_sp1;
   \  NEXT_P0;
   \  _x_ip0 = (Cell) IPTOS;
   \  _x_sp0 = (Cell) spTOS;
   \  INC_IP(1);
   \  /* sp += 0; */
   \  /* lit ( #w -- w ) */
   \  /*  */
   \  NAME("lit")
   \  {
   \  Cell w;
   \  w = (Cell) _x_ip0;
   \  #ifdef VM_DEBUG
   \  if (vm_debug) {
   \  fputs(" w=", vm_out); printarg_w (w);
   \  fputc('\n', vm_out);
   \  }
   \  #endif
   \  {
   \  #line 136 "./prim"
   \  }
   \  _x_sp1 = (Cell)w;
   \  }
   \  I_plus:      /* + ( n1 n2 -- n ) */
   \  /*  */
   \  NAME("+")
   \  {
   \  DEF_CA
   \  Cell n1;
   \  Cell n2;
   \  Cell n;
   \  NEXT_P0;
   \  n1 = (Cell) _x_sp0;
   \  n2 = (Cell) _x_sp1;
   \  #ifdef VM_DEBUG
   \  if (vm_debug) {
   \  fputs(" n1=", vm_out); printarg_n (n1);
   \  fputs(" n2=", vm_out); printarg_n (n2);
   \  fputc('\n', vm_out);
   \  }
   \  #endif
   \  {
   \  #line 516 "./prim"
   \  n = n1+n2;
   \  }
   \  NEXT_P1;
   \  _x_sp0 = (Cell)n;
   \  NEXT_P2;
   \  }
   \  NEXT_P1;
   \  spTOS = (Cell)_x_sp0;
   \  NEXT_P2;
   
   : init-combined ( -- )
       prim to combined
       0 num-combined !
       current-depth max-stacks cells erase
       max-depth     max-stacks cells erase
       min-depth     max-stacks cells erase
       prim prim-effect-in  prim prim-effect-in-end  !
       prim prim-effect-out prim prim-effect-out-end ! ;
   
   : max! ( n addr -- )
       tuck @ max swap ! ;
   
   : min! ( n addr -- )
       tuck @ min swap ! ;
   
   : add-depths { p -- }
       \ combine stack effect of p with *-depths
       max-stacks 0 ?do
           current-depth i th @
           p prim-stacks-in  i th @ +
           dup max-depth i th max!
           p prim-stacks-out i th @ -
           dup min-depth i th min!
           current-depth i th !
       loop ;
   
   : add-prim ( addr u -- )
       \ add primitive given by "addr u" to combined-prims
       primitives search-wordlist s" unknown primitive" ?print-error
       execute { p }
       p combined-prims num-combined @ th !
       1 num-combined +!
       p add-depths ;
   
   : compute-effects { q -- }
       \ compute the stack effects of q from the depths
       max-stacks 0 ?do
           max-depth i th @ dup
           q prim-stacks-in i th !
           current-depth i th @ -
           q prim-stacks-out i th !
       loop ;
   
   : make-effect-items { stack# items effect-endp -- }
       \ effect-endp points to a pointer to the end of the current item-array
       \ and has to be updated
       stacks stack# th @ { stack }
       items 0 +do
           effect-endp @ { item }
           i 0 <# #s stack stack-pointer 2@ holds [char] _ hold #> save-mem
           item item-name 2!
           stack item item-stack !
           stack stack-type @ item item-type !
           i item item-offset !
           item item-first on
           item% %size effect-endp +!
       loop ;
   
   : init-effects { q -- }
       \ initialize effects field for FETCHES and STORES
       max-stacks 0 ?do
           i q prim-stacks-in  i th @ q prim-effect-in-end  make-effect-items
           i q prim-stacks-out i th @ q prim-effect-out-end make-effect-items
       loop ;
   
   : process-combined ( -- )
       combined combined-prims num-combined @ cells
       combinations ['] constant insert-wordlist
       prim compute-effects
       prim init-effects
       output-combined perform ;
   
   \ C output
   
   : print-item { n stack -- }
       \ print nth stack item name
       stack stack-type @ type-c-name 2@ type space
       ." _" stack stack-pointer 2@ type n 0 .r ;
   
   : print-declarations-combined ( -- )
       max-stacks 0 ?do
           max-depth i th @ min-depth i th @ - 0 +do
               i stacks j th @ print-item ." ;" cr
           loop
       loop ;
   
   : part-fetches ( -- )
       fetches ;
   
   : part-output-c-tail ( -- )
       stores ;
   
   : output-combined-tail ( -- )
       part-output-c-tail
       prim >r combined to prim
       in-part @ >r in-part off
       output-c-tail
       r> in-part ! r> to prim ;
   
   : output-part ( p -- )
       to prim
       ." /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
       ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
       ." {" cr
       print-declarations
       part-fetches
       print-debug-args
       prim add-depths \ !! right place?
       ." {" cr
       ." #line " c-line @ . quote c-filename 2@ type quote cr
       prim prim-c-code 2@ ['] output-combined-tail type-c-code
       ." }" cr
       part-output-c-tail
       ." }" cr ;
   
   : output-parts ( -- )
       prim >r in-part on
       current-depth max-stacks cells erase
       num-combined @ 0 +do
           combined-prims i th @ output-part
       loop
       in-part off
       r> to prim ;
   
   : output-c-combined ( -- )
       print-entry cr
       \ debugging messages just in parts
       ." {" cr
       ." DEF_CA" cr
       print-declarations-combined
       ." NEXT_P0;" cr
       flush-tos
       fetches
       \ print-debug-args
       stack-pointer-updates
       output-parts
       output-c-tail
       ." }" cr
       cr ;
   
   : output-forth-combined ( -- )
   ;
   
   
   \ peephole optimization rules
   
   \ in order for this to work as intended, shorter combinations for each
   \ length must be present, and the longer combinations must follow
   \ shorter ones (this restriction may go away in the future).
   
   : output-peephole ( -- )
       combined-prims num-combined @ 1- cells combinations search-wordlist
       s" the prefix for this combination must be defined earlier" ?print-error
       ." {"
       execute prim-num @ 5 .r ." ,"
       combined-prims num-combined @ 1- th @ prim-num @ 5 .r ." ,"
       combined prim-num @ 5 .r ." }, /* "
       combined prim-c-name 2@ type ."  */"
       cr ;
   
   
   \ the parser
   
   eof-char max-member \ the whole character set + EOF
   
   : getinput ( -- n )
    rawinput @ endrawinput @ =
    if
      eof-char
    else
      cookedinput @ c@
    endif ;
   
   :noname ( n -- )
    dup bl > if
     emit space
    else
     .
    endif ;
   print-token !
   
   : testchar? ( set -- f )
    getinput member? ;
   ' testchar? test-vector !
   
   : checksyncline ( -- )
       \ when input points to a newline, check if the next line is a
       \ sync line.  If it is, perform the appropriate actions.
       rawinput @ >r
       s" #line " r@ over compare 0<> if
           rdrop 1 line +! EXIT
       endif
       0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
       dup c@ bl = if
           char+ dup c@ [char] " <> 0= s" sync line syntax" ?print-error
           char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
           char+
       endif
       dup c@ nl-char <> 0= s" sync line syntax" ?print-error
       skipsynclines @ if
           dup char+ rawinput !
           rawinput @ c@ cookedinput @ c!
       endif
       drop ;
   
   : ?nextchar ( f -- )
       s" syntax error, wrong char" ?print-error
       rawinput @ endrawinput @ <> if
           rawinput @ c@
           1 chars rawinput +!
           1 chars cookedinput +!
           nl-char = if
               checksyncline
               rawinput @ line-start !
           endif
           rawinput @ c@ cookedinput @ c!
       endif ;
   
   : charclass ( set "name" -- )
    ['] ?nextchar terminal ;
   
   : .. ( c1 c2 -- set )
    ( creates a set that includes the characters c, c1<=c<=c2 )
    empty copy-set
    swap 1+ rot do
     i over add-member
    loop ;
   
   : ` ( -- terminal ) ( use: ` c )
    ( creates anonymous terminal for the character c )
    char singleton ['] ?nextchar make-terminal ;
   
   char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
   char 0 char 9 ..                                        charclass digit
   bl singleton tab-char over add-member                   charclass white
   nl-char singleton eof-char over add-member complement   charclass nonl
   nl-char singleton eof-char over add-member
       char : over add-member complement                   charclass nocolonnl
   bl 1+ maxchar .. char \ singleton complement intersection
                                                           charclass nowhitebq
   bl 1+ maxchar ..                                        charclass nowhite
   char " singleton eof-char over add-member complement    charclass noquote
   nl-char singleton                                       charclass nl
   eof-char singleton                                      charclass eof
   nl-char singleton eof-char over add-member              charclass nleof
   
   (( letter (( letter || digit )) **
   )) <- c-ident ( -- )
   
   (( ` # ?? (( letter || digit || ` : )) **
   )) <- stack-ident ( -- )
   
   (( nowhitebq nowhite ** ))
   <- forth-ident ( -- )
   
   Variable forth-flag
   Variable c-flag
   
   (( (( ` e || ` E )) {{ start }} nonl **
      {{ end evaluate }}
   )) <- eval-comment ( ... -- ... )
   
   (( (( ` f || ` F )) {{ start }} nonl **
      {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
   )) <- forth-comment ( -- )
   
   (( (( ` c || ` C )) {{ start }} nonl **
      {{ end c-flag @ IF type cr ELSE 2drop THEN }}
   )) <- c-comment ( -- )
   
   (( ` - nonl ** {{
           forth-flag @ IF ." [ELSE]" cr THEN
           c-flag @ IF ." #else" cr THEN }}
   )) <- else-comment
   
   (( ` + {{ start }} nonl ** {{ end
           dup
           IF      c-flag @
                   IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr
                   THEN
                   forth-flag @
                   IF  ." has? " type ."  [IF]"  cr THEN
           ELSE    2drop
               c-flag @      IF  ." #endif"  cr THEN
               forth-flag @  IF  ." [THEN]"  cr THEN
           THEN }}
   )) <- if-comment
   
   (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
   
   (( ` \ comment-body nleof )) <- comment ( -- )
   
   (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **
   <- stack-items
   
   (( {{ prim prim-effect-in }}  stack-items {{ prim prim-effect-in-end ! }}
      ` - ` - white **
      {{ prim prim-effect-out }} stack-items {{ prim prim-effect-out-end ! }}
   )) <- stack-effect ( -- )
   
   (( {{ prim create-prim }}
      ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **
      (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **
         (( {{ start }}  c-ident {{ end prim prim-c-name 2! }} )) ??
      )) ??  nleof
      (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nleof )) ??
      {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nleof white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
      (( ` :  white ** nleof
         {{ start }} (( nonl ++  nleof white ** )) ++ {{ end prim prim-forth-code 2! }}
      )) ?? {{ process-simple }}
      nleof
   )) <- simple-primitive ( -- )
   
   (( {{ init-combined }}
      ` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++
      nleof {{ process-combined }}
   )) <- combined-primitive
   
   (( {{ make-prim to prim 0 to combined
         line @ name-line ! filename 2@ name-filename 2!
         function-number @ prim prim-num !
         start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++
      (( simple-primitive || combined-primitive )) {{ 1 function-number +! }}
   )) <- primitive ( -- )
   
   (( (( comment || primitive || nl white ** )) ** eof ))
   parser primitives2something
   warnings @ [IF]
   .( parser generated ok ) cr
   [THEN]
   
   : primfilter ( addr u -- )
       \ process the string at addr u
       over dup rawinput ! dup line-start ! cookedinput !
       + endrawinput !
       checksyncline
       primitives2something ;
   
   : process-file ( addr u xt-simple x-combined -- )
       output-combined ! output !
       save-mem 2dup filename 2!
       slurp-file
     warnings @ if      warnings @ if
         ." ------------ CUT HERE -------------" cr  endif          ." ------------ CUT HERE -------------" cr  endif
     r> primfilter ;      primfilter ;
   
 : process      ( xt -- )  \  : process      ( xt -- )
     bl word count rot  \      bl word count rot
     process-file ;  \      process-file ;

Generate output suitable for use with a patch program
Legend:
Removed from v.1.59  
changed lines
  Added in v.1.85
CVS Admin

Powered by ViewCVS 1.0-dev 		(Powered by ViewCVS)

ViewCVS and CVS Help