Diff for /gforth/prims2x.fs between versions 1.18 and 1.26

version 1.18, 1995/12/26 17:35:37 version 1.26, 1997/02/08 22:58:16
Line 42 Line 42
   
 warnings off  warnings off
   
   include extend.fs
   
   \ require interpretation.fs
 require debugging.fs  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]
Line 56  maxchar 1+ constant eof-char Line 59  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
   >r dup -1 r> read-file throw + ;    >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)
Line 65  variable line \ line number of char poin Line 68  variable line \ line number of char poin
 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!
   2variable f-comment
   0 0 f-comment 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 
   
   Variable flush-comment flush-comment off
   
   : ?flush-comment
    flush-comment @ 0= ?EXIT
    f-comment 2@ nip
    IF  cr f-comment 2@ 2 /string type 0 0 f-comment 2! THEN ;
   
 : start ( -- addr )  : start ( -- addr )
  cookedinput @ ;   cookedinput @ ;
   
Line 164  print-token ! Line 176  print-token !
     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-mem filename 2!
         char+          char+
     endif      endif
     dup c@ nl-char <> abort" sync line syntax"      dup c@ nl-char <> abort" sync line syntax"
Line 203  print-token ! Line 215  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 223  eof-char singleton     charclass eof Line 235  eof-char singleton     charclass eof
 nowhite ++  nowhite ++
 <- name ( -- )  <- name ( -- )
   
 (( ` \ nonl ** nl  (( {{ ?flush-comment start }} ` \ nonl ** nl {{ end
         2dup 2 min s" \+" compare 0= IF  f-comment 2!  ELSE  2drop  THEN }}
 )) <- comment ( -- )  )) <- 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 ! }}
Line 305  constant type-description Line 318  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 360  constant type-description Line 373  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 )
Line 594  set-current Line 607  set-current
 : output-label ( -- )  : output-label ( -- )
  ." &&I_" c-name 2@ type ." ," cr ;   ." &&I_" c-name 2@ type ." ," cr ;
   
 : output-alias ( -- )  : output-alias ( -- )  flush-comment on
    ?flush-comment
  primitive-number @ . ." alias " forth-name 2@ type cr   primitive-number @ . ." alias " forth-name 2@ type cr
  -1 primitive-number +! ;   -1 primitive-number +! ;
   
 : output-forth ( -- )  : output-forth ( -- )  flush-comment on
    ?flush-comment
  forth-code @ 0=   forth-code @ 0=
  IF    output-alias   IF    output-alias
  ELSE  ." : " forth-name 2@ type ."   ( "   ELSE  ." : " forth-name 2@ type ."   ( "

Removed from v.1.18  
changed lines
  Added in v.1.26


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