--- gforth/prims2x.fs	1994/07/13 19:21:07	1.4
+++ gforth/prims2x.fs	1994/09/08 17:20:12	1.7
@@ -15,14 +15,13 @@
 \ 5) Words that call NEXT themselves have to be done very carefully.
 \
 \ To do:
-\ add the store optimization for doubles
 \ regarding problem 1 above: It would be better (for over) to implement
 \ 	the alternative
 
 warnings off
 
+[IFUNDEF] vocabulary  include search-order.fs [THEN]
 include gray.fs
-include search-order.fs
 
 100 constant max-effect \ number of things on one side of a stack effect
 4096 constant batch-size \ no meaning, just make sure it's >0
@@ -89,7 +88,7 @@ variable effect-out-end ( pointer )
 2variable effect-in-size
 2variable effect-out-size
 
-variable primitive-number -8 primitive-number !
+variable primitive-number -9 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
@@ -524,7 +523,7 @@ set-current
  ." NEXT_P1;" cr
  stores
  fill-tos
- ." NEXT1_P2;" cr
+ ." NEXT_P2;" cr
  ." }" cr
  cr
 ;
@@ -543,4 +542,5 @@ set-current
  endif
  warnings @ if
  ." ------------ CUT HERE -------------" cr  endif
- r> [ ] primfilter [ 0 ] ;
+ r> primfilter ;
+