Diff for /gforth/prims2x.fs between versions 1.42 and 1.45

version 1.42, 1999/05/10 12:50:49 version 1.45, 2000/07/14 08:55:15
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 235  print-token ! Line 214  print-token !
   
 char a char z ..  char A char Z ..  union char _ singleton union  charclass letter  char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
 char 0 char 9 ..                                        charclass digit  char 0 char 9 ..                                        charclass digit
 bl singleton                                            charclass blank  bl singleton tab-char over add-member                   charclass white
 tab-char singleton                                      charclass tab  
 nl-char singleton eof-char over add-member complement   charclass nonl  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  nl-char singleton eof-char over add-member char : over add-member complement  charclass nocolonnl
 bl 1+ maxchar ..                                        charclass nowhite  bl 1+ maxchar ..                                        charclass nowhite
Line 262  Variable c-flag Line 240  Variable c-flag
    {{ end c-flag @ IF type cr ELSE 2drop THEN }}     {{ end c-flag @ IF type cr ELSE 2drop THEN }}
 )) <- c-comment ( -- )  )) <- c-comment ( -- )
   
 (( (( forth-comment || c-comment )) ?? nonl ** )) <- comment-body  (( ` - nonl ** {{ 
           forth-flag @ IF ." [ELSE]" cr THEN
 (( {{ ?flush-comment start }} ` \ comment-body nl {{ end          c-flag @ IF ." #else" cr THEN }}
       2dup 2 min s" \+" compare 0= IF  f-comment 2!  ELSE  2drop  THEN }}  )) <- else-comment
 )) <- comment ( -- )  
   (( ` + {{ start }} nonl ** {{ end
 (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}          dup
    ` - ` - blank **          IF      c-flag @
    {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-out-end ! }}                  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 + }} white ** )) ** {{ effect-in-end ! }}
      ` - ` - white **
      {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} white ** )) ** {{ effect-out-end ! }}
 )) <- stack-effect ( -- )  )) <- stack-effect ( -- )
   
 (( {{ s" " doc 2! s" " forth-code 2! }}  (( {{ s" " doc 2! s" " forth-code 2! }}
    (( comment || nl )) **     (( comment || nl )) **
    (( {{ line @ name-line ! filename 2@ name-filename 2! }}     (( {{ line @ name-line ! filename 2@ name-filename 2! }}
       {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  tab ++        {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  white ++
       {{ start }} stack-effect {{ end stack-string 2! }} tab ++        ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **
         {{ start }} name {{ end wordset 2! }} tab **          {{ start }} name {{ end wordset 2! }} white **
         (( {{ start }}  c-name {{ end c-name 2! }} )) ??  nl          (( {{ start }}  c-name {{ end c-name 2! }} )) ??  nl
    ))     ))
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " nl )) ??     (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " nl )) ??
Line 613  set-current Line 609  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
  ." {" cr   ." {" cr
Line 638  set-current Line 633  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 647  set-current Line 650  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.42  
changed lines
  Added in v.1.45


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