--- gforth/prims2x.fs	1994/10/24 19:16:06	1.10
+++ gforth/prims2x.fs	1995/10/16 18:33:12	1.15
@@ -21,7 +21,8 @@
 
 warnings off
 
-[IFUNDEF] vocabulary  include search-order.fs [THEN]
+[IFUNDEF] vocabulary    include search-order.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
@@ -89,7 +90,7 @@ variable effect-out-end ( pointer )
 2variable effect-in-size
 2variable effect-out-size
 
-variable primitive-number -9 primitive-number !
+variable primitive-number -10 primitive-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
@@ -514,14 +515,15 @@ set-current
 : 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
  ." DEF_CA" cr
  declarations
  compute-offsets \ for everything else
+ ." NEXT_P0;" cr
  flush-tos
  fetches
- stack-pointer-updates cr
- ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging
+ stack-pointer-updates
  ." {" cr
  c-code 2@ type
  ." }" cr
@@ -555,9 +557,9 @@ set-current
     get-current documentation set-current
     forth-name 2@ nextname create
     forth-name 2@ 2,
-    stack-string 2@ 2,
+    stack-string 2@ condition-stack-effect 2,
     wordset 2@ 2,
-    c-name 2@ 2,
+    c-name 2@ condition-pronounciation 2,
     doc 2@ 2,
     set-current ;
 [THEN]