--- gforth/kernel/cond.fs	2000/06/17 12:01:55	1.8
+++ gforth/kernel/cond.fs	2003/01/19 23:35:34	1.15
@@ -1,6 +1,6 @@
 \ Structural Conditionals                              12dec92py
 
-\ Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995-2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 here 0 , \ just a dummy, the real value of locals-list is patched into it in glocals.fs
 AConstant locals-list \ acts like a variable that contains
@@ -109,8 +109,10 @@ variable backedge-locals
 : sys?        ( sys -- )        dup 0= ?struc ;
 : >mark ( -- orig )
  cs-push-orig 0 , ;
-: >resolve    ( addr -- )        here over - swap ! ;
-: <resolve    ( addr -- )        here - , ;
+: >resolve    ( addr -- )
+    here swap !
+    basic-block-end ;
+: <resolve    ( addr -- )        , ;
 
 : BUT
     1 cs-roll ;                      immediate restrict
@@ -155,7 +157,8 @@ Defer begin-like ( -- )
 ' noop IS begin-like
 
 : BEGIN ( compilation -- dest ; run-time -- ) \ core
-    begin-like cs-push-part dest ; immediate restrict
+    begin-like cs-push-part dest
+    basic-block-end ; immediate restrict
 
 Defer again-like ( dest -- addr )
 ' nip IS again-like
@@ -299,12 +302,13 @@ Defer exit-like ( -- )
 ' noop IS exit-like
 
 : EXIT ( compilation -- ; run-time nest-sys -- ) \ core
-    \G Return to the calling definition; usually used as a way of
-    \G forcing an early return from a definition. Before
-    \G @code{EXIT}ing you must clean up the return stack and
-    \G @code{UNLOOP} any outstanding @code{?DO}...@code{LOOP}s.
+\G Return to the calling definition; usually used as a way of
+\G forcing an early return from a definition. Before
+\G @code{EXIT}ing you must clean up the return stack and
+\G @code{UNLOOP} any outstanding @code{?DO}...@code{LOOP}s.
     exit-like
     POSTPONE ;s
+    basic-block-end
     POSTPONE unreachable ; immediate restrict
 
 : ?EXIT ( -- ) ( compilation -- ; run-time nest-sys f -- | nest-sys ) \ gforth