--- gforth/prims2x.fs	1995/12/23 16:21:59	1.17
+++ gforth/prims2x.fs	1999/05/10 12:54:48	1.43
@@ -1,6 +1,6 @@
 \ converts primitives to, e.g., C code 
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -42,47 +42,43 @@
 
 warnings off
 
-[IFUNDEF] vocabulary    include search-order.fs [THEN]
-[IFUNDEF] environment?  include environ.fs      [THEN]
-include gray.fs
+[IFUNDEF] vocabulary	\ we are executed just with kernel image
+			\ load the rest that is needed
+			\ (require fails because this file is needed from a
+			\ different directory with the wordlibraries)
+include ./search.fs			
+include ./extend.fs
+[THEN]
+
+[IFUNDEF] environment?
+include ./environ.fs
+[THEN]
+
+include ./gray.fs
 
 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
 maxchar 1+ constant eof-char
 #tab constant tab-char
 #lf constant nl-char
 
-: read-whole-file ( c-addr1 file-id -- c-addr2 )
-\ 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
-  begin ( c-addr file-id )
-    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 endinput \ pointer to the end of the input (the char after the last)
+variable rawinput \ pointer to next character to be scanned
+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 
-\ !! 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 )
- input @ ;
+ cookedinput @ ;
 
 : end ( addr -- addr u )
- input @ over - ;
+ cookedinput @ over - ;
 
 variable output \ xt ( -- ) of output word
 
@@ -126,6 +122,7 @@ variable name-line
 2variable last-name-filename
 
 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
 \ since neither forget nor marker are implemented yet, we make a new
@@ -145,12 +142,11 @@ variable items
 eof-char max-member \ the whole character set + EOF
 
 : getinput ( -- n )
- input @
- dup endinput @ =
+ rawinput @ endrawinput @ =
  if
-   drop eof-char
+   eof-char
  else
-   c@
+   cookedinput @ c@
  endif ;
 
 :noname ( n -- )
@@ -168,35 +164,38 @@ print-token !
 : checksyncline ( -- )
     \ when input points to a newline, check if the next line is a
     \ sync line.  If it is, perform the appropriate actions.
-    input @ >r
+    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 - filename 2!
+	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+ input !
+	dup char+ rawinput !
+	rawinput @ c@ cookedinput @ c!
     endif
     drop ;
 
 : ?nextchar ( f -- )
     ?not? if
-	." syntax error" cr
+	filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"
 	getinput . cr
-	input @ endinput @ over - 100 min type cr
+	rawinput @ endrawinput @ over - 100 min type cr
 	abort
     endif
-    input @ endinput @ <> if
-	input @ c@
-	1 input +!
+    rawinput @ endrawinput @ <> if
+	rawinput @ c@
+	1 chars rawinput +!
+	1 chars cookedinput +!
 	nl-char = if
 	    checksyncline
 	endif
+	rawinput @ c@ cookedinput @ c!
     endif ;
 
 : charclass ( set "name" -- )
@@ -211,7 +210,7 @@ print-token !
 
 : ` ( -- terminal ) ( use: ` 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 0 char 9 ..					charclass digit
@@ -231,16 +230,40 @@ eof-char singleton					charclass eof
 nowhite ++
 <- name ( -- )
 
-(( ` \ nonl ** nl
-)) <- comment ( -- )
+Variable forth-flag
+Variable c-flag
+
+(( (( ` f || ` F )) {{ start }} nonl ** 
+   {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
+)) <- forth-comment ( -- )
+
+(( (( ` c || ` C )) {{ start }} nonl ** 
+   {{ end c-flag @ IF type cr ELSE 2drop THEN }}
+)) <- c-comment ( -- )
+
+(( ` - nonl ** {{ 
+	forth-flag @ IF ." [ELSE]" cr THEN
+	c-flag @ IF ." #else" cr THEN }}
+)) <- else-comment
+
+(( ` + {{ start }} nonl ** {{ end
+	dup
+	IF	c-flag @
+		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
 
-\ (( ` # ` 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 ( -- )
+(( (( forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
 
-\ (( nl syncline ?? )) <- nlsync
+(( ` \ comment-body nl )) <- comment ( -- )
 
 (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}
    ` - ` - blank **
@@ -256,14 +279,14 @@ nowhite ++
         (( {{ start }}  c-name {{ end c-name 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
       {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}
    )) ??
    (( nl || eof ))
 )) <- primitive ( -- )
 
-(( (( primitive {{ printprim }} )) **  eof ))
+(( (( primitive {{ printprim }} )) ** eof ))
 parser primitives2something
 warnings @ [IF]
 .( parser generated ok ) cr
@@ -272,12 +295,15 @@ warnings @ [IF]
 : primfilter ( file-id xt -- )
 \ fileid is for the input file, xt ( -- ) is for the output word
  output !
- here input !
- here swap read-whole-file
- dup endinput !
- here - allot
+ here dup rawinput ! cookedinput !
+ here unused rot read-file throw
+ dup here + endrawinput !
+ allot
  align
  checksyncline
+\ begin
+\     getinput dup eof-char = ?EXIT emit true ?nextchar
+\ again ;
  primitives2something ;
 
 \ types
@@ -318,11 +344,11 @@ constant type-description
 
 : fetch-double ( item -- )
  >r
- r@ item-name 2@ type 
- ." = ({Double_Store _d; _d.cells.low = "
+ ." FETCH_DCELL("
+ r@ item-name 2@ type ." , "
  r@ item-d-offset @ dup    effect-in-size 2@ data-stack-access
- ." ; _d.cells.high = " 1+ effect-in-size 2@ data-stack-access
- ." ; _d.dcell;});" cr
+ ." , "			1+ effect-in-size 2@ data-stack-access
+ ." );" cr
  rdrop ;
 
 : fetch-float ( item -- )
@@ -351,6 +377,10 @@ constant type-description
 \ true if item has the same offset as the input TOS
  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 -- )
  >r
  r@ item-d-offset @ effect-out-size 2@ data-stack-access ."  = (Cell)"
@@ -361,7 +391,7 @@ constant type-description
  >r
  r@ d-same-as-in?
  if
-   r@ is-in-tos?
+   r@ is-in-tos? r@ is-out-tos? xor
    if
      ." IF_TOS(" r@ really-store-single ." );" cr
    endif
@@ -373,10 +403,10 @@ constant type-description
 : store-double ( item -- )
 \ !! store optimization is not performed, because it is not yet needed
  >r
- ." {Double_Store _d; _d.dcell = " r@ item-name 2@ type ." ; "
- r@ item-d-offset @ dup    effect-out-size 2@ data-stack-access 
- ."  = _d.cells.low; " 1+ effect-out-size 2@ data-stack-access
- ." = _d.cells.high;}" cr
+ ." STORE_DCELL(" r@ item-name 2@ type ." , "
+ r@ item-d-offset @ dup    effect-out-size 2@ data-stack-access
+ ." , "			1+ effect-out-size 2@ data-stack-access
+ ." );" cr
  rdrop ;
 
 : f-same-as-in? ( item -- f )
@@ -460,7 +490,7 @@ s" DFloat *"	single-type starts-with df_
 s" SFloat *"	single-type starts-with sf_
 s" Xt"		single-type starts-with xt
 s" WID"		single-type starts-with wid
-s" F83Name *"	single-type starts-with f83name
+s" struct F83Name *"	single-type starts-with f83name
 
 set-current
 
@@ -580,7 +610,7 @@ set-current
    i item-name 2@ type space
  item-descr +loop ; 
 
-: output-c ( -- )
+: output-c ( -- ) 
  ." 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
@@ -604,22 +634,59 @@ set-current
  cr
 ;
 
-: output-label ( -- )
- ." &&I_" c-name 2@ type ." ," cr ;
-
-: output-alias ( -- )
- primitive-number @ . ." alias " forth-name 2@ type cr
- -1 primitive-number +! ;
-
-: output-forth ( -- )
- forth-code @ 0=
- IF    output-alias
- ELSE  ." : " forth-name 2@ type ."   ( "
-       effect-in effect-in-end @ .stack-list ." -- "
-       effect-out effect-out-end @ .stack-list ." )" cr
-       forth-code 2@ type cr
-       -1 primitive-number +!
- THEN ;
+: 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 ( -- )  
+    ." (Label)&&I_" c-name 2@ type ." ," cr
+    -1 primitive-number +! ;
+
+: output-alias ( -- ) 
+    ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr
+    -1 primitive-number +! ;
+
+: output-forth ( -- )  
+    forth-code @ 0=
+    IF    	\ output-alias
+	\ this is bad for ec: an alias is compiled if tho word does not exist!
+	\ JAW
+    ELSE  ." : " forth-name 2@ type ."   ( "
+	effect-in effect-in-end @ .stack-list ." -- "
+	effect-out effect-out-end @ .stack-list ." )" cr
+	forth-code 2@ type cr
+	-1 primitive-number +!
+    THEN ;
 
 : output-tag-file ( -- )
     name-filename 2@ last-name-filename 2@ compare if
@@ -653,8 +720,12 @@ set-current
 : process-file ( addr u xt -- )
     >r
     2dup filename 2!
+    0 function-number !
     r/o open-file abort" cannot open file"
     warnings @ if
 	." ------------ CUT HERE -------------" cr  endif
     r> primfilter ;
 
+: process      ( xt -- )
+    bl word count rot
+    process-file ;