--- gforth/prims2x.fs	1996/01/07 17:22:13	1.19
+++ gforth/prims2x.fs	1996/05/23 15:13:12	1.22
@@ -42,6 +42,7 @@
 
 warnings off
 
+require interpretation.fs
 require debugging.fs
 [IFUNDEF] vocabulary    include search-order.fs [THEN]
 [IFUNDEF] environment?  include environ.fs      [THEN]
@@ -203,7 +204,7 @@ print-token !
 
 : ` ( -- terminal ) ( use: ` c )
  ( creates anonymous terminal for the character c )
- [compile] ascii singleton ['] ?nextchar make-terminal ;
+ char singleton ['] ?nextchar make-terminal ;
 
 char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
 char 0 char 9 ..					charclass digit
@@ -305,11 +306,11 @@ constant type-description
 
 : fetch-double ( item -- )
  >r
- r@ item-name 2@ type 
- ." = ({Double_Store _d; _d.cells.low = "
+ ." FETCH_DCELL("
+ r@ item-name 2@ type ." , "
  r@ item-d-offset @ dup    effect-in-size 2@ data-stack-access
- ." ; _d.cells.high = " 1+ effect-in-size 2@ data-stack-access
- ." ; _d.dcell;});" cr
+ ." , "			1+ effect-in-size 2@ data-stack-access
+ ." );" cr
  rdrop ;
 
 : fetch-float ( item -- )
@@ -360,10 +361,10 @@ constant type-description
 : store-double ( item -- )
 \ !! store optimization is not performed, because it is not yet needed
  >r
- ." {Double_Store _d; _d.dcell = " r@ item-name 2@ type ." ; "
- r@ item-d-offset @ dup    effect-out-size 2@ data-stack-access 
- ."  = _d.cells.low; " 1+ effect-out-size 2@ data-stack-access
- ." = _d.cells.high;}" cr
+ ." STORE_DCELL(" r@ item-name 2@ type ." , "
+ r@ item-d-offset @ dup    effect-out-size 2@ data-stack-access
+ ." , "			1+ effect-out-size 2@ data-stack-access
+ ." );" cr
  rdrop ;
 
 : f-same-as-in? ( item -- f )