--- gforth/prims2x.fs	1998/05/02 21:28:43	1.30
+++ gforth/prims2x.fs	1998/10/25 23:15:46	1.33
@@ -42,8 +42,8 @@
 
 warnings off
 
-include search.fs
-include extend.fs
+require search.fs
+require extend.fs
 
 \ require interpretation.fs
 \ require debugs.fs
@@ -353,6 +353,10 @@ constant type-description
 \ true if item has the same offset as the input TOS
  item-d-offset @ 1+ effect-in-size 2@ drop = ;
 
+: is-out-tos? ( item -- f )
+\ true if item has the same offset as the input TOS
+ item-d-offset @ 1+ effect-out-size 2@ drop = ;
+
 : really-store-single ( item -- )
  >r
  r@ item-d-offset @ effect-out-size 2@ data-stack-access ."  = (Cell)"
@@ -363,7 +367,7 @@ constant type-description
  >r
  r@ d-same-as-in?
  if
-   r@ is-in-tos?
+   r@ is-in-tos? r@ is-out-tos? xor
    if
      ." IF_TOS(" r@ really-store-single ." );" cr
    endif
@@ -462,7 +466,7 @@ s" DFloat *"	single-type starts-with df_
 s" SFloat *"	single-type starts-with sf_
 s" Xt"		single-type starts-with xt
 s" WID"		single-type starts-with wid
-s" F83Name *"	single-type starts-with f83name
+s" struct F83Name *"	single-type starts-with f83name
 
 set-current
 
@@ -641,7 +645,7 @@ set-current
     cr ;
 
 : output-label ( -- )
-    ." &&I_" c-name 2@ type ." ," cr ;
+    ." (Label)&&I_" c-name 2@ type ." ," cr ;
 
 : output-alias ( -- )  flush-comment on
  ?flush-comment