Diff for /gforth/prims2x.fs between versions 1.38 and 1.44

version 1.38, 1998/12/25 22:50:49 version 1.44, 1999/05/17 13:13:27
Line 42 Line 42
   
 warnings off  warnings off
   
 require search.fs  [IFUNDEF] vocabulary    \ we are executed just with kernel image
 require extend.fs                          \ load the rest that is needed
                           \ (require fails because this file is needed from a
                           \ different directory with the wordlibraries)
   include ./search.fs                     
   include ./extend.fs
   [THEN]
   
   [IFUNDEF] environment?
   include ./environ.fs
   [THEN]
   
 \ require interpretation.fs  include ./gray.fs
 \ require debugs.fs  
 [IFUNDEF] vocabulary    include search.fs [THEN]  
 [IFUNDEF] environment?  include environ.fs      [THEN]  
 include gray.fs  
   
 100 constant max-effect \ number of things on one side of a stack effect  100 constant max-effect \ number of things on one side of a stack effect
 255 constant maxchar  255 constant maxchar
Line 57  maxchar 1+ constant eof-char Line 62  maxchar 1+ constant eof-char
 #tab constant tab-char  #tab constant tab-char
 #lf constant nl-char  #lf constant nl-char
   
 : read-whole-file ( c-addr1 file-id -- c-addr2 )  
 \ reads the contents of the file file-id puts it into memory at c-addr1  
 \ c-addr2 is the first address after the file block  
   >r dup $7fffffff r> read-file throw + ;  
   
 variable rawinput \ pointer to next character to be scanned  variable rawinput \ pointer to next character to be scanned
 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
Line 74  variable line \ line number of char poin Line 74  variable line \ line number of char poin
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?  variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
 skipsynclines on   skipsynclines on 
   
 Variable flush-comment flush-comment off  
   
 : ?flush-comment  
     flush-comment @ 0= ?EXIT  
     f-comment 2@ nip  
     IF  cr f-comment 2@ 2 /string 1-  
         dup IF  
             2dup s" -" compare 0=  
             IF  
                 flush-comment @ 1 =  
                 IF    ." #else"  
                 ELSE  ." [ELSE]"  THEN  
             ELSE  
                 flush-comment @ 1 =  
                 IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP  
                 ELSE  ." has? " type ."  [IF]"  THEN  
             THEN  cr  
         ELSE    flush-comment @ 1 = IF  ." #endif"  ELSE  ." [THEN]"  THEN  
             cr  THEN  
         0 0 f-comment 2! THEN ;  
   
 : start ( -- addr )  : start ( -- addr )
  cookedinput @ ;   cookedinput @ ;
   
Line 251  eof-char singleton     charclass eof Line 230  eof-char singleton     charclass eof
 nowhite ++  nowhite ++
 <- name ( -- )  <- name ( -- )
   
 (( {{ ?flush-comment start }} ` \ nonl ** nl {{ end  Variable forth-flag
       2dup 2 min s" \+" compare 0= IF  f-comment 2!  ELSE  2drop  THEN }}  Variable c-flag
 )) <- 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
   
   (( (( forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
   
   (( ` \ comment-body nl )) <- comment ( -- )
   
 (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}  (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}
    ` - ` - blank **     ` - ` - blank **
Line 286  warnings @ [IF] Line 296  warnings @ [IF]
 \ fileid is for the input file, xt ( -- ) is for the output word  \ fileid is for the input file, xt ( -- ) is for the output word
  output !   output !
  here dup rawinput ! cookedinput !   here dup rawinput ! cookedinput !
  here swap read-whole-file   here unused rot read-file throw
  dup endrawinput !   dup here + endrawinput !
  here - allot   allot
  align   align
  checksyncline   checksyncline
 \ begin  \ begin
Line 600  set-current Line 610  set-current
    i item-name 2@ type space     i item-name 2@ type space
  item-descr +loop ;    item-descr +loop ; 
   
 : output-c ( -- ) 1 flush-comment !  : output-c ( -- ) 
     ?flush-comment  
  ." I_" c-name 2@ type ." :     /* " forth-name 2@ type ."  ( " stack-string 2@ type ."  ) */" cr   ." I_" c-name 2@ type ." :     /* " forth-name 2@ type ."  ( " stack-string 2@ type ."  ) */" cr
  ." /* " doc 2@ type ."  */" cr   ." /* " doc 2@ type ."  */" cr
  ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging   ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging
Line 625  set-current Line 634  set-current
  cr   cr
 ;  ;
   
   : dstack-used?
     effect-in-size 2@ drop
     effect-out-size 2@ drop max 0<> ;
   
   : fstack-used?
     effect-in-size 2@ nip
     effect-out-size 2@ nip max 0<> ;
   
 : output-funclabel ( -- )  : output-funclabel ( -- )
   1 function-number +!    1 function-number +!
   ." &I_" c-name 2@ type ." ," cr ;    ." &I_" c-name 2@ type ." ," cr ;
Line 634  set-current Line 651  set-current
   '" emit forth-name 2@ type '" emit ." ," cr ;    '" emit forth-name 2@ type '" emit ." ," cr ;
   
 : output-c-func ( -- )  : output-c-func ( -- )
   \ used for word libraries
     1 function-number +!      1 function-number +!
     ." void I_" c-name 2@ type ." ()      /* " forth-name 2@ type      ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type
     ."  ( " stack-string 2@ type ."  ) */" cr      ."  ( " stack-string 2@ type ."  ) */" cr
     ." /* " doc 2@ type ."  */" cr      ." /* " doc 2@ type ."  */" cr
     ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr      ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr
     \ debugging      \ debugging
     ." {" cr      ." {" cr
     ." DEF_CA" cr  
     declarations      declarations
     compute-offsets \ for everything else      compute-offsets \ for everything else
     ." NEXT_P0;" cr      dstack-used? IF ." Cell *sp=SP;" cr THEN
       fstack-used? IF ." Cell *fp=*FP;" cr THEN
     flush-tos      flush-tos
     fetches      fetches
     stack-pointer-updates      stack-pointer-updates
       fstack-used? IF ." *FP=fp;" cr THEN
     ." {" cr      ." {" cr
     ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr      ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
     c-code 2@ type      c-code 2@ type
     ." }" cr      ." }" cr
     ." NEXT_P1;" cr  
     stores      stores
     fill-tos      fill-tos
     ." NEXT_P2;" cr      ." return (sp);" cr
     ." }" cr      ." }" cr
     cr ;      cr ;
   
 : output-label ( -- )  1 flush-comment !  : output-label ( -- )  
     ?flush-comment  
     ." (Label)&&I_" c-name 2@ type ." ," cr      ." (Label)&&I_" c-name 2@ type ." ," cr
     -1 primitive-number +! ;      -1 primitive-number +! ;
   
 : output-alias ( -- )  flush-comment on  : output-alias ( -- ) 
     ?flush-comment  
     ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr      ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr
     -1 primitive-number +! ;      -1 primitive-number +! ;
   
 : output-forth ( -- )  flush-comment on  : output-forth ( -- )  
     ?flush-comment  
     forth-code @ 0=      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!

Removed from v.1.38  
changed lines
  Added in v.1.44


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