--- gforth/prims2x.fs	1997/02/06 21:23:05	1.25
+++ gforth/prims2x.fs	1998/12/11 22:54:27	1.36
@@ -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,12 @@
 
 warnings off
 
-include extend.fs
+require search.fs
+require extend.fs
 
 \ require interpretation.fs
-require debugging.fs
-[IFUNDEF] vocabulary    include search-order.fs [THEN]
+\ require debugs.fs
+[IFUNDEF] vocabulary    include search.fs [THEN]
 [IFUNDEF] environment?  include environ.fs      [THEN]
 include gray.fs
 
@@ -73,6 +74,27 @@ variable line \ line number of char poin
 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 1-
+	dup IF
+	    2dup s" -" compare 0=
+	    IF
+		flush-comment @ 1 =
+		IF    ." #else"
+		ELSE  ." [ELSE]"  THEN
+	    ELSE
+		flush-comment @ 1 =
+		IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP
+		ELSE  ." has? " type ."  [IF]"  THEN
+	    THEN  cr
+	ELSE    flush-comment @ 1 = IF  ." #endif"  ELSE  ." [THEN]"  THEN
+	    cr  THEN
+	0 0 f-comment 2! THEN ;
+
 : start ( -- addr )
  cookedinput @ ;
 
@@ -121,6 +143,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
@@ -228,7 +251,7 @@ eof-char singleton					charclass eof
 nowhite ++
 <- name ( -- )
 
-(( {{ start }} ` \ nonl ** nl {{ end
+(( {{ ?flush-comment start }} ` \ nonl ** nl {{ end
       2dup 2 min s" \+" compare 0= IF  f-comment 2!  ELSE  2drop  THEN }}
 )) <- comment ( -- )
 
@@ -253,7 +276,7 @@ nowhite ++
    (( nl || eof ))
 )) <- primitive ( -- )
 
-(( (( primitive {{ printprim }} )) **  eof ))
+(( (( primitive {{ printprim }} )) ** eof ))
 parser primitives2something
 warnings @ [IF]
 .( parser generated ok ) cr
@@ -344,6 +367,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)"
@@ -354,7 +381,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
@@ -453,7 +480,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
 
@@ -573,7 +600,8 @@ set-current
    i item-name 2@ type space
  item-descr +loop ; 
 
-: output-c ( -- )
+: output-c ( -- ) 1 flush-comment !
+    ?flush-comment
  ." 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
@@ -597,26 +625,63 @@ set-current
  cr
 ;
 
-: output-label ( -- )
- ." &&I_" c-name 2@ type ." ," cr ;
-
-: output-alias ( -- )
- f-comment 2@ nip
- IF  cr f-comment 2@ 2 /string type 0 0 f-comment 2! THEN
- primitive-number @ . ." alias " forth-name 2@ type cr
- -1 primitive-number +! ;
-
-: output-forth ( -- )
- f-comment 2@ 2 min s" \+" compare 0=
- IF  cr f-comment 2@ 2 /string type 0 0 f-comment 2! THEN
- 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 ( -- )  1 flush-comment !
+    ?flush-comment
+    ." [" -2 primitive-number @ - 0 .r ." ] "
+    ." (Label)&&I_" c-name 2@ type ." ," cr
+    -1 primitive-number +! ;
+
+: output-alias ( -- )  flush-comment on
+    ?flush-comment
+    primitive-number @ . ." alias " forth-name 2@ type cr
+    -1 primitive-number +! ;
+
+: output-forth ( -- )  flush-comment on
+    ?flush-comment
+    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
@@ -650,8 +715,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 ;