--- gforth/prims2x.fs	1994/09/28 17:02:50	1.9
+++ gforth/prims2x.fs	1995/02/23 20:17:23	1.14
@@ -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
@@ -347,13 +348,13 @@ constant type-description
  endif
  rdrop ;
  
-: single-type ( -- xt n1 n2 )
+: single-type ( -- xt1 xt2 n1 n2 )
  ['] fetch-single ['] store-single 1 0 ;
 
-: double-type ( -- xt n1 n2 )
+: double-type ( -- xt1 xt2 n1 n2 )
  ['] fetch-double ['] store-double 2 0 ;
 
-: float-type ( -- xt n1 n2 )
+: float-type ( -- xt1 xt2 n1 n2 )
  ['] fetch-float ['] store-float 0 1 ;
 
 : s, ( addr u -- )
@@ -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
@@ -548,8 +550,19 @@ set-current
        effect-out effect-out-end @ .stack-list ." )" cr
        forth-code 2@ type cr
        -1 primitive-number +!
- THEN
-;
+ THEN ;
+
+[IFDEF] documentation
+: register-doc ( -- )
+    get-current documentation set-current
+    forth-name 2@ nextname create
+    forth-name 2@ 2,
+    stack-string 2@ 2,
+    wordset 2@ 2,
+    c-name 2@ 2,
+    doc 2@ 2,
+    set-current ;
+[THEN]
 
 : process-file ( addr u xt -- )
  >r r/o open-file abort" cannot open file"