--- gforth/prims2x.fs	1999/04/25 21:06:52	1.41
+++ gforth/prims2x.fs	2000/09/23 15:46:58	1.48
@@ -1,6 +1,6 @@
 \ converts primitives to, e.g., C code 
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 
 \ This is not very nice (hard limits, no checking, assumes 1 chars = 1)
@@ -74,27 +74,6 @@ 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 @ ;
 
@@ -235,11 +214,13 @@ 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
+nl-char singleton eof-char over add-member
+    char : over add-member complement                   charclass nocolonnl
+bl 1+ maxchar .. char \ singleton complement intersection
+                                                        charclass nowhitebq
+bl 1+ maxchar ..                                        charclass nowhite
 char " singleton eof-char over add-member complement	charclass noquote
 nl-char singleton					charclass nl
 eof-char singleton					charclass eof
@@ -248,35 +229,63 @@ eof-char singleton					charclass eof
 (( letter (( letter || digit )) **
 )) <- c-name ( -- )
 
-nowhite ++
+(( nowhitebq nowhite ** ))
 <- name ( -- )
 
-(( {{ ?flush-comment start }} ` \ nonl ** nl {{ end
-      2dup 2 min s" \+" compare 0= IF  f-comment 2!  ELSE  2drop  THEN }}
-)) <- comment ( -- )
-
-(( {{ 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 ! }}
+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
+
+(( (( 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 )) ??
    {{ 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! }}
-   )) ??
+   )) ?? {{ printprim }}
    (( nl || eof ))
 )) <- primitive ( -- )
 
-(( (( primitive {{ printprim }} )) ** eof ))
+(( (( comment || primitive || nl )) ** eof ))
 parser primitives2something
 warnings @ [IF]
 .( parser generated ok ) cr
@@ -600,9 +609,8 @@ set-current
    i item-name 2@ type space
  item-descr +loop ; 
 
-: output-c ( -- ) 1 flush-comment !
-    ?flush-comment
- ." 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
@@ -625,6 +633,14 @@ set-current
  cr
 ;
 
+: 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 ;
@@ -634,43 +650,41 @@ set-current
   '" emit forth-name 2@ type '" emit ." ," cr ;
 
 : output-c-func ( -- )
+\ used for word libraries
     1 function-number +!
-    ." void I_" c-name 2@ type ." ()      /* " forth-name 2@ type
+    ." 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
-    ." DEF_CA" cr
     declarations
     compute-offsets \ for everything else
-    ." NEXT_P0;" cr
+    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
-    ." NEXT_P1;" cr
     stores
     fill-tos
-    ." NEXT_P2;" cr
+    ." return (sp);" cr
     ." }" cr
     cr ;
 
-: output-label ( -- )  1 flush-comment !
-    ?flush-comment
+: output-label ( -- )  
     ." (Label)&&I_" c-name 2@ type ." ," cr
     -1 primitive-number +! ;
 
-: output-alias ( -- )  flush-comment on
-    ?flush-comment
+: output-alias ( -- ) 
     ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr
     -1 primitive-number +! ;
 
-: output-forth ( -- )  flush-comment on
-    ?flush-comment
+: output-forth ( -- )  
     forth-code @ 0=
     IF    	\ output-alias
 	\ this is bad for ec: an alias is compiled if tho word does not exist!