--- gforth/kernel/cond.fs	2002/09/24 17:57:29	1.13
+++ gforth/kernel/cond.fs	2007/12/31 18:40:26	1.22
@@ -1,12 +1,12 @@
 \ Structural Conditionals                              12dec92py
 
-\ Copyright (C) 1995,1996,1997,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,2000,2003,2004,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 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
@@ -105,10 +104,13 @@ variable backedge-locals
 
 \ Structural Conditionals                              12dec92py
 
+defer other-control-flow ( -- )
+\ hook for control-flow stuff that's not handled by begin-like etc.
+
 : ?struc      ( flag -- )       abort" unstructured " ;
 : sys?        ( sys -- )        dup 0= ?struc ;
 : >mark ( -- orig )
- cs-push-orig 0 , ;
+ cs-push-orig 0 , other-control-flow ;
 : >resolve    ( addr -- )
     here swap !
     basic-block-end ;
@@ -122,18 +124,18 @@ variable backedge-locals
 \ Structural Conditionals                              12dec92py
 
 : AHEAD ( compilation -- orig ; run-time -- ) \ tools-ext
-    POSTPONE abranch  >mark  POSTPONE unreachable ; immediate restrict
+    POSTPONE branch  >mark  POSTPONE unreachable ; immediate restrict
 
 : IF ( compilation -- orig ; run-time f -- ) \ core
- POSTPONE a?branch >mark ; immediate restrict
+ POSTPONE ?branch >mark ; immediate restrict
 
 : ?DUP-IF ( compilation -- orig ; run-time n -- n| ) \ gforth	question-dupe-if
 \G This is the preferred alternative to the idiom "@code{?DUP IF}", since it can be
 \G better handled by tools like stack checkers. Besides, it's faster.
-    POSTPONE a?dup-?branch >mark ;       immediate restrict
+    POSTPONE ?dup-?branch >mark ;       immediate restrict
 
 : ?DUP-0=-IF ( compilation -- orig ; run-time n -- n| ) \ gforth	question-dupe-zero-equals-if
-    POSTPONE a?dup-0=-?branch >mark ;       immediate restrict
+    POSTPONE ?dup-0=-?branch >mark ;       immediate restrict
 
 Defer then-like ( orig -- )
 : cs>addr ( orig/dest -- )  drop >resolve drop ;
@@ -148,7 +150,7 @@ immediate restrict
 \ people who have not been brought up with Forth (or who have been
 \ brought up with fig-Forth).
 
-: ELSE ( compilation orig1 -- orig2 ; run-time f -- ) \ core
+: ELSE ( compilation orig1 -- orig2 ; run-time -- ) \ core
     POSTPONE ahead
     1 cs-roll
     POSTPONE then ; immediate restrict
@@ -164,7 +166,7 @@ Defer again-like ( dest -- addr )
 ' nip IS again-like
 
 : AGAIN ( compilation dest -- ; run-time -- ) \ core-ext
-    dest? again-like  POSTPONE abranch  <resolve ; immediate restrict
+    dest? again-like  POSTPONE branch  <resolve ; immediate restrict
 
 Defer until-like ( list addr xt1 xt2 -- )
 :noname ( list addr xt1 xt2 -- )
@@ -172,7 +174,7 @@ Defer until-like ( list addr xt1 xt2 --
 IS until-like
 
 : UNTIL ( compilation dest -- ; run-time f -- ) \ core
-    dest? ['] a?branch ['] a?branch-lp+!# until-like ; immediate restrict
+    dest? ['] ?branch ['] ?branch-lp+!# until-like ; immediate restrict
 
 : WHILE ( compilation dest -- orig dest ; run-time f -- ) \ core
     POSTPONE if
@@ -251,19 +253,19 @@ Avariable leave-sp  leave-stack 3 cells
     POSTPONE begin drop do-dest ;
 
 : ?DO ( compilation -- do-sys ; run-time w1 w2 -- | loop-sys )	\ core-ext	question-do
-    POSTPONE a(?do) ?do-like ; immediate restrict
+    POSTPONE (?do) ?do-like ; immediate restrict
 
 : +DO ( compilation -- do-sys ; run-time n1 n2 -- | loop-sys )	\ gforth	plus-do
-    POSTPONE a(+do) ?do-like ; immediate restrict
+    POSTPONE (+do) ?do-like ; immediate restrict
 
 : U+DO ( compilation -- do-sys ; run-time u1 u2 -- | loop-sys )	\ gforth	u-plus-do
-    POSTPONE a(u+do) ?do-like ; immediate restrict
+    POSTPONE (u+do) ?do-like ; immediate restrict
 
 : -DO ( compilation -- do-sys ; run-time n1 n2 -- | loop-sys )	\ gforth	minus-do
-    POSTPONE a(-do) ?do-like ; immediate restrict
+    POSTPONE (-do) ?do-like ; immediate restrict
 
 : U-DO ( compilation -- do-sys ; run-time u1 u2 -- | loop-sys )	\ gforth	u-minus-do
-    POSTPONE a(u-do) ?do-like ; immediate restrict
+    POSTPONE (u-do) ?do-like ; immediate restrict
 
 : FOR ( compilation -- do-sys ; run-time u -- loop-sys )	\ gforth
     POSTPONE (for)
@@ -277,24 +279,24 @@ Avariable leave-sp  leave-stack 3 cells
     until-like  POSTPONE done  POSTPONE unloop ;
 
 : LOOP ( compilation do-sys -- ; run-time loop-sys1 -- | loop-sys2 )	\ core
- ['] a(loop) ['] a(loop)-lp+!# loop-like ; immediate restrict
+ ['] (loop) ['] (loop)-lp+!# loop-like ; immediate restrict
 
 : +LOOP ( compilation do-sys -- ; run-time loop-sys1 n -- | loop-sys2 )	\ core	plus-loop
- ['] a(+loop) ['] a(+loop)-lp+!# loop-like ; immediate restrict
+ ['] (+loop) ['] (+loop)-lp+!# loop-like ; immediate restrict
 
 \ !! should the compiler warn about +DO..-LOOP?
 : -LOOP ( compilation do-sys -- ; run-time loop-sys1 u -- | loop-sys2 )	\ gforth	minus-loop
- ['] a(-loop) ['] a(-loop)-lp+!# loop-like ; immediate restrict
+ ['] (-loop) ['] (-loop)-lp+!# loop-like ; immediate restrict
 
 \ A symmetric version of "+LOOP". I.e., "-high -low ?DO -inc S+LOOP"
 \ will iterate as often as "high low ?DO inc S+LOOP". For positive
 \ increments it behaves like "+LOOP". Use S+LOOP instead of +LOOP for
 \ negative increments.
 : S+LOOP ( compilation do-sys -- ; run-time loop-sys1 n -- | loop-sys2 )	\ gforth	s-plus-loop
- ['] a(s+loop) ['] a(s+loop)-lp+!# loop-like ; immediate restrict
+ ['] (s+loop) ['] (s+loop)-lp+!# loop-like ; immediate restrict
 
 : NEXT ( compilation do-sys -- ; run-time loop-sys1 -- | loop-sys2 ) \ gforth
- ['] a(next) ['] a(next)-lp+!# loop-like ; immediate restrict
+ ['] (next) ['] (next)-lp+!# loop-like ; immediate restrict
 
 \ Structural Conditionals                              12dec92py