Diff for /gforth/prims2x.fs between versions 1.17 and 1.21

version 1.17, 1995/12/23 16:21:59 version 1.21, 1996/05/09 18:13:02
Line 42 Line 42
   
 warnings off  warnings off
   
   require debugging.fs
 [IFUNDEF] vocabulary    include search-order.fs [THEN]  [IFUNDEF] vocabulary    include search-order.fs [THEN]
 [IFUNDEF] environment?  include environ.fs      [THEN]  [IFUNDEF] environment?  include environ.fs      [THEN]
 include gray.fs  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
 4096 constant batch-size \ no meaning, just make sure it's >0  
 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 56  maxchar 1+ constant eof-char Line 56  maxchar 1+ constant eof-char
 : read-whole-file ( c-addr1 file-id -- c-addr2 )  : read-whole-file ( c-addr1 file-id -- c-addr2 )
 \ reads the contents of the file file-id puts it into memory at c-addr1  \ 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  \ c-addr2 is the first address after the file block
   begin ( c-addr file-id )    >r dup -1 r> read-file throw + ;
     2dup batch-size swap read-file   
     if  
       true abort" I/O error"  
     endif  
     ( c-addr file-id actual-size ) rot over + -rot  
     batch-size <>  
   until  
   drop ;  
   
 variable input \ pointer to next character to be parsed  variable rawinput \ pointer to next character to be scanned
 variable endinput \ 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 line \ line number of char pointed to by input  variable line \ line number of char pointed to by input
 1 line !  1 line !
 2variable filename \ filename of original input file  2variable filename \ filename of original input file
 0 0 filename 2!  0 0 filename 2!
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?  variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
 skipsynclines on   skipsynclines on 
 \ !! unfortunately, this does not mean that they do not appear in the  
 \ output. This could be changed by copying the input (skipping  
 \ synclines) in ?nextchar  
   
 : start ( -- addr )  : start ( -- addr )
  input @ ;   cookedinput @ ;
   
 : end ( addr -- addr u )  : end ( addr -- addr u )
  input @ over - ;   cookedinput @ over - ;
   
 variable output \ xt ( -- ) of output word  variable output \ xt ( -- ) of output word
   
Line 145  variable items Line 135  variable items
 eof-char max-member \ the whole character set + EOF  eof-char max-member \ the whole character set + EOF
   
 : getinput ( -- n )  : getinput ( -- n )
  input @   rawinput @ endrawinput @ =
  dup endinput @ =  
  if   if
    drop eof-char     eof-char
  else   else
    c@     cookedinput @ c@
  endif ;   endif ;
   
 :noname ( n -- )  :noname ( n -- )
Line 168  print-token ! Line 157  print-token !
 : checksyncline ( -- )  : checksyncline ( -- )
     \ when input points to a newline, check if the next line is a      \ when input points to a newline, check if the next line is a
     \ sync line.  If it is, perform the appropriate actions.      \ sync line.  If it is, perform the appropriate actions.
     input @ >r      rawinput @ >r
     s" #line " r@ over compare 0<> if      s" #line " r@ over compare 0<> if
         rdrop 1 line +! EXIT          rdrop 1 line +! EXIT
     endif      endif
     0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )      0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
     dup c@ bl = if      dup c@ bl = if
         char+ dup c@ [char] " <> abort" sync line syntax"          char+ dup c@ [char] " <> abort" sync line syntax"
         char+ dup 100 [char] " scan drop swap 2dup - filename 2!          char+ dup 100 [char] " scan drop swap 2dup - save-string filename 2!
         char+          char+
     endif      endif
     dup c@ nl-char <> abort" sync line syntax"      dup c@ nl-char <> abort" sync line syntax"
     skipsynclines @ if      skipsynclines @ if
         dup char+ input !          dup char+ rawinput !
           rawinput @ c@ cookedinput @ c!
     endif      endif
     drop ;      drop ;
   
 : ?nextchar ( f -- )  : ?nextchar ( f -- )
     ?not? if      ?not? if
         ." syntax error" cr          filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"
         getinput . cr          getinput . cr
         input @ endinput @ over - 100 min type cr          rawinput @ endrawinput @ over - 100 min type cr
         abort          abort
     endif      endif
     input @ endinput @ <> if      rawinput @ endrawinput @ <> if
         input @ c@          rawinput @ c@
         1 input +!          1 chars rawinput +!
           1 chars cookedinput +!
         nl-char = if          nl-char = if
             checksyncline              checksyncline
         endif          endif
           rawinput @ c@ cookedinput @ c!
     endif ;      endif ;
   
 : charclass ( set "name" -- )  : charclass ( set "name" -- )
Line 211  print-token ! Line 203  print-token !
   
 : ` ( -- terminal ) ( use: ` c )  : ` ( -- terminal ) ( use: ` c )
  ( creates anonymous terminal for the character c )   ( creates anonymous terminal for the character c )
  [compile] ascii singleton ['] ?nextchar make-terminal ;   char singleton ['] ?nextchar make-terminal ;
   
 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
Line 234  nowhite ++ Line 226  nowhite ++
 (( ` \ nonl ** nl  (( ` \ nonl ** nl
 )) <- comment ( -- )  )) <- comment ( -- )
   
 \ (( ` # ` l ` i ` n ` e blank  
 \ {{ 0. start }} digit ++ {{ end >number abort" line number?" drop drop 1- line ! }} blank  
 \    (( ` " {{ start }} noquote ++ {{ end filename 2! }} `" )) ??  
 \    nl  
 \ )) <- syncline ( -- )  
   
 \ (( nl syncline ?? )) <- nlsync  
   
 (( {{ 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 **
    {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-out-end ! }}     {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-out-end ! }}
Line 256  nowhite ++ Line 240  nowhite ++
         (( {{ 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 @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! }}     {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! skipsynclines on }}
    (( ` :  nl     (( ` :  nl
       {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}        {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}
    )) ??     )) ??
Line 272  warnings @ [IF] Line 256  warnings @ [IF]
 : primfilter ( file-id xt -- )  : primfilter ( file-id xt -- )
 \ 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 input !   here dup rawinput ! cookedinput !
  here swap read-whole-file   here swap read-whole-file
  dup endinput !   dup endrawinput !
  here - allot   here - allot
  align   align
  checksyncline   checksyncline
   \ begin
   \     getinput dup eof-char = ?EXIT emit true ?nextchar
   \ again ;
  primitives2something ;   primitives2something ;
   
 \ types  \ types
Line 318  constant type-description Line 305  constant type-description
   
 : fetch-double ( item -- )  : fetch-double ( item -- )
  >r   >r
  r@ item-name 2@ type    ." FETCH_DCELL("
  ." = ({Double_Store _d; _d.cells.low = "   r@ item-name 2@ type ." , "
  r@ item-d-offset @ dup    effect-in-size 2@ data-stack-access   r@ item-d-offset @ dup    effect-in-size 2@ data-stack-access
  ." ; _d.cells.high = " 1+ effect-in-size 2@ data-stack-access   ." , "                 1+ effect-in-size 2@ data-stack-access
  ." ; _d.dcell;});" cr   ." );" cr
  rdrop ;   rdrop ;
   
 : fetch-float ( item -- )  : fetch-float ( item -- )
Line 373  constant type-description Line 360  constant type-description
 : 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
  ." {Double_Store _d; _d.dcell = " r@ item-name 2@ type ." ; "   ." STORE_DCELL(" r@ item-name 2@ type ." , "
  r@ item-d-offset @ dup    effect-out-size 2@ data-stack-access    r@ item-d-offset @ dup    effect-out-size 2@ data-stack-access
  ."  = _d.cells.low; " 1+ effect-out-size 2@ data-stack-access   ." , "                 1+ effect-out-size 2@ data-stack-access
  ." = _d.cells.high;}" cr   ." );" cr
  rdrop ;   rdrop ;
   
 : f-same-as-in? ( item -- f )  : f-same-as-in? ( item -- f )

Removed from v.1.17  
changed lines
  Added in v.1.21


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