--- gforth/prims2x.fs	1996/05/23 15:13:12	1.22
+++ gforth/prims2x.fs	2000/07/14 08:55:15	1.45
@@ -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,11 +42,19 @@
 
 warnings off
 
-require interpretation.fs
-require debugging.fs
-[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
 255 constant maxchar
@@ -54,11 +62,6 @@ 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
-  >r dup -1 r> read-file throw + ;
-
 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
@@ -66,6 +69,8 @@ variable line \ line number of char poin
 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 
 
@@ -117,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
@@ -165,7 +171,7 @@ print-token !
     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-string filename 2!
+	char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
 	char+
     endif
     dup c@ nl-char <> abort" sync line syntax"
@@ -208,8 +214,7 @@ print-token !
 
 char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
 char 0 char 9 ..					charclass digit
-bl singleton						charclass blank
-tab-char singleton					charclass tab
+bl singleton tab-char over add-member			charclass white
 nl-char singleton eof-char over add-member complement	charclass nonl
 nl-char singleton eof-char over add-member char : over add-member complement  charclass nocolonnl
 bl 1+ maxchar ..					charclass nowhite
@@ -224,20 +229,52 @@ eof-char singleton					charclass eof
 nowhite ++
 <- name ( -- )
 
-(( ` \ nonl ** nl
-)) <- comment ( -- )
+Variable forth-flag
+Variable c-flag
 
-(( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}
-   ` - ` - blank **
-   {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-out-end ! }}
+(( (( ` 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
+
+(( (( forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
+
+(( ` \ comment-body nl )) <- comment ( -- )
+
+(( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} white ** )) ** {{ effect-in-end ! }}
+   ` - ` - white **
+   {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} white ** )) ** {{ effect-out-end ! }}
 )) <- stack-effect ( -- )
 
 (( {{ s" " doc 2! s" " forth-code 2! }}
    (( comment || nl )) **
    (( {{ 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 }} name {{ end wordset 2! }} tab **
+      {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  white ++
+      ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **
+        {{ start }} name {{ end wordset 2! }} white **
         (( {{ start }}  c-name {{ end c-name 2! }} )) ??  nl
    ))
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " nl )) ??
@@ -248,7 +285,7 @@ nowhite ++
    (( nl || eof ))
 )) <- primitive ( -- )
 
-(( (( primitive {{ printprim }} )) **  eof ))
+(( (( primitive {{ printprim }} )) ** eof ))
 parser primitives2something
 warnings @ [IF]
 .( parser generated ok ) cr
@@ -258,9 +295,9 @@ warnings @ [IF]
 \ fileid is for the input file, xt ( -- ) is for the output word
  output !
  here dup rawinput ! cookedinput !
- here swap read-whole-file
- dup endrawinput !
- here - allot
+ here unused rot read-file throw
+ dup here + endrawinput !
+ allot
  align
  checksyncline
 \ begin
@@ -339,6 +376,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)"
@@ -349,7 +390,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
@@ -448,7 +489,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
 
@@ -568,8 +609,8 @@ set-current
    i item-name 2@ type space
  item-descr +loop ; 
 
-: output-c ( -- )
- ." I_" c-name 2@ type ." :	/* " forth-name 2@ type ."  ( " stack-string 2@ type ."  ) */" cr
+: 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
  ." {" cr
@@ -592,22 +633,68 @@ 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 ;
+: dstack-used?
+  effect-in-size 2@ drop
+  effect-out-size 2@ drop max 0<> ;
+
+: fstack-used?
+  effect-in-size 2@ nip
+  effect-out-size 2@ nip max 0<> ;
+
+: 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 ( -- )
+\ used for word libraries
+    1 function-number +!
+    ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " 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
+    declarations
+    compute-offsets \ for everything else
+    dstack-used? IF ." Cell *sp=SP;" cr THEN
+    fstack-used? IF ." Cell *fp=*FP;" cr THEN
+    flush-tos
+    fetches
+    stack-pointer-updates
+    fstack-used? IF ." *FP=fp;" cr THEN
+    ." {" cr
+    ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
+    c-code 2@ type
+    ." }" cr
+    stores
+    fill-tos
+    ." return (sp);" 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
@@ -641,8 +728,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 ;