Diff for /gforth/prims2x.fs between versions 1.20 and 1.33

version 1.20, 1996/02/13 11:12:19 version 1.33, 1998/10/25 23:15:46
Line 42 Line 42
   
 warnings off  warnings off
   
 require debugging.fs  require search.fs
 [IFUNDEF] vocabulary    include search-order.fs [THEN]  require 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
   
Line 56  maxchar 1+ constant eof-char Line 60  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 69  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 116  variable name-line Line 129  variable name-line
 2variable last-name-filename  2variable last-name-filename
   
 variable primitive-number -10 primitive-number !  variable primitive-number -10 primitive-number !
   Variable function-number 0 function-number !
   
 \ for several reasons stack items of a word are stored in a wordlist  \ for several reasons stack items of a word are stored in a wordlist
 \ since neither forget nor marker are implemented yet, we make a new  \ since neither forget nor marker are implemented yet, we make a new
Line 164  print-token ! Line 178  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 - save-string 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 217  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 237  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 338  constant type-description Line 353  constant type-description
 \ true if item has the same offset as the input TOS  \ true if item has the same offset as the input TOS
  item-d-offset @ 1+ effect-in-size 2@ drop = ;   item-d-offset @ 1+ effect-in-size 2@ drop = ;
   
   : is-out-tos? ( item -- f )
   \ true if item has the same offset as the input TOS
    item-d-offset @ 1+ effect-out-size 2@ drop = ;
   
 : really-store-single ( item -- )  : really-store-single ( item -- )
  >r   >r
  r@ item-d-offset @ effect-out-size 2@ data-stack-access ."  = (Cell)"   r@ item-d-offset @ effect-out-size 2@ data-stack-access ."  = (Cell)"
Line 348  constant type-description Line 367  constant type-description
  >r   >r
  r@ d-same-as-in?   r@ d-same-as-in?
  if   if
    r@ is-in-tos?     r@ is-in-tos? r@ is-out-tos? xor
    if     if
      ." IF_TOS(" r@ really-store-single ." );" cr       ." IF_TOS(" r@ really-store-single ." );" cr
    endif     endif
Line 447  s" DFloat *" single-type starts-with df_ Line 466  s" DFloat *" single-type starts-with df_
 s" SFloat *"    single-type starts-with sf_  s" SFloat *"    single-type starts-with sf_
 s" Xt"          single-type starts-with xt  s" Xt"          single-type starts-with xt
 s" WID"         single-type starts-with wid  s" WID"         single-type starts-with wid
 s" F83Name *"   single-type starts-with f83name  s" struct F83Name *"    single-type starts-with f83name
   
 set-current  set-current
   
Line 591  set-current Line 610  set-current
  cr   cr
 ;  ;
   
   : output-funclabel ( -- )
     1 function-number +!
     ." &I_" c-name 2@ type ." ," cr ;
   
   : output-forthname ( -- )
     1 function-number +!
     '" emit forth-name 2@ type '" emit ." ," cr ;
   
   : output-c-func ( -- )
       1 function-number +!
       ." void I_" c-name 2@ type ." ()      /* " forth-name 2@ type
       ."  ( " stack-string 2@ type ."  ) */" cr
       ." /* " doc 2@ type ."  */" cr
       ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr
       \ debugging
       ." {" cr
       ." DEF_CA" cr
       declarations
       compute-offsets \ for everything else
       ." NEXT_P0;" cr
       flush-tos
       fetches
       stack-pointer-updates
       ." {" cr
       ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
       c-code 2@ type
       ." }" cr
       ." NEXT_P1;" cr
       stores
       fill-tos
       ." NEXT_P2;" cr
       ." }" cr
       cr ;
   
 : output-label ( -- )  : output-label ( -- )
  ." &&I_" c-name 2@ type ." ," cr ;      ." (Label)&&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
  forth-code @ 0=      ?flush-comment
  IF    output-alias      forth-code @ 0=
  ELSE  ." : " forth-name 2@ type ."   ( "      IF          \ output-alias
        effect-in effect-in-end @ .stack-list ." -- "          \ this is bad for ec: an alias is compiled if tho word does not exist!
        effect-out effect-out-end @ .stack-list ." )" cr          \ JAW
        forth-code 2@ type cr      ELSE  ." : " forth-name 2@ type ."   ( "
        -1 primitive-number +!          effect-in effect-in-end @ .stack-list ." -- "
  THEN ;          effect-out effect-out-end @ .stack-list ." )" cr
           forth-code 2@ type cr
           -1 primitive-number +!
       THEN ;
   
 : output-tag-file ( -- )  : output-tag-file ( -- )
     name-filename 2@ last-name-filename 2@ compare if      name-filename 2@ last-name-filename 2@ compare if
Line 640  set-current Line 697  set-current
 : process-file ( addr u xt -- )  : process-file ( addr u xt -- )
     >r      >r
     2dup filename 2!      2dup filename 2!
       0 function-number !
     r/o open-file abort" cannot open file"      r/o open-file abort" cannot open file"
     warnings @ if      warnings @ if
         ." ------------ CUT HERE -------------" cr  endif          ." ------------ CUT HERE -------------" cr  endif
     r> primfilter ;      r> primfilter ;
   
   : process      ( xt -- )
       bl word count rot
       process-file ;
   

Removed from v.1.20  
changed lines
  Added in v.1.33


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