Diff for /gforth/prims2x.fs between versions 1.16 and 1.27

version 1.16, 1995/11/07 18:06:57 version 1.27, 1997/05/21 20:39:37
Line 42 Line 42
   
 warnings off  warnings off
   
 [IFUNDEF] vocabulary    include search-order.fs [THEN]  include extend.fs
   
   \ require interpretation.fs
   \ require debugs.fs
   [IFUNDEF] vocabulary    include search.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
 9 constant tab-char  #tab constant tab-char
 10 constant nl-char  #lf constant nl-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 $7fffffff 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
   1 line !
   2variable filename \ filename of original input file
   0 0 filename 2!
   2variable f-comment
   0 0 f-comment 2!
   variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
   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 )
  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 110  variable effect-in-end ( pointer ) Line 121  variable effect-in-end ( pointer )
 variable effect-out-end ( pointer )  variable effect-out-end ( pointer )
 2variable effect-in-size  2variable effect-in-size
 2variable effect-out-size  2variable effect-out-size
   variable c-line
   2variable c-filename
   variable name-line
   2variable name-filename
   2variable last-name-filename
   
 variable primitive-number -10 primitive-number !  variable primitive-number -10 primitive-number !
   
Line 131  variable items Line 147  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 151  print-token ! Line 166  print-token !
  getinput member? ;   getinput member? ;
 ' testchar? test-vector !  ' 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] " <> abort" sync line syntax"
           char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
           char+
       endif
       dup c@ nl-char <> abort" sync line syntax"
       skipsynclines @ if
           dup char+ rawinput !
           rawinput @ c@ cookedinput @ c!
       endif
       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
    1 input +!          rawinput @ c@
  endif ;          1 chars rawinput +!
           1 chars cookedinput +!
           nl-char = if
               checksyncline
           endif
           rawinput @ c@ cookedinput @ c!
       endif ;
   
 : charclass ( set "name" -- )  : charclass ( set "name" -- )
  ['] ?nextchar terminal ;   ['] ?nextchar terminal ;
Line 174  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 194  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 204  nowhite ++ Line 246  nowhite ++
   
 (( {{ s" " doc 2! s" " forth-code 2! }}  (( {{ s" " doc 2! s" " forth-code 2! }}
    (( comment || nl )) **     (( comment || nl )) **
    (( {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  tab ++     (( {{ line @ name-line ! filename 2@ name-filename 2! }}
         {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  tab ++
       {{ start }} stack-effect {{ end stack-string 2! }} tab ++        {{ start }} stack-effect {{ end stack-string 2! }} tab ++
         {{ start }} name {{ end wordset 2! }} tab **          {{ start }} name {{ end wordset 2! }} tab **
         (( {{ 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 )) ??
    {{ 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 226  warnings @ [IF] Line 269  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
   \ begin
   \     getinput dup eof-char = ?EXIT emit true ?nextchar
   \ again ;
  primitives2something ;   primitives2something ;
   
 \ types  \ types
Line 271  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 326  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 546  set-current Line 593  set-current
  fetches   fetches
  stack-pointer-updates   stack-pointer-updates
  ." {" cr   ." {" 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   ." NEXT_P1;" cr
Line 559  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 ."   ( "
Line 573  set-current Line 623  set-current
        -1 primitive-number +!         -1 primitive-number +!
  THEN ;   THEN ;
   
   : output-tag-file ( -- )
       name-filename 2@ last-name-filename 2@ compare if
           name-filename 2@ last-name-filename 2!
           #ff emit cr
           name-filename 2@ type
           ." ,0" cr
       endif ;
   
   : output-tag ( -- )
       output-tag-file
       forth-name 2@ 1+ type
       127 emit
       space forth-name 2@ type space
       1 emit
       name-line @ 0 .r
       ." ,0" cr ;
   
 [IFDEF] documentation  [IFDEF] documentation
 : register-doc ( -- )  : register-doc ( -- )
     get-current documentation set-current      get-current documentation set-current
Line 586  set-current Line 653  set-current
 [THEN]  [THEN]
   
 : process-file ( addr u xt -- )  : process-file ( addr u xt -- )
  >r r/o open-file abort" cannot open file"      >r
  warnings @ if      2dup filename 2!
  ." ------------ CUT HERE -------------" cr  endif      r/o open-file abort" cannot open file"
  r> primfilter ;      warnings @ if
           ." ------------ CUT HERE -------------" cr  endif
       r> primfilter ;
   

Removed from v.1.16  
changed lines
  Added in v.1.27


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