--- gforth/assert.fs	2002/12/04 16:56:31	1.11
+++ gforth/assert.fs	2012/12/31 15:25:17	1.19
@@ -1,12 +1,12 @@
 \ assertions
 
-\ Copyright (C) 1995,1996,1997,1999 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1999,2002,2003,2007,2010,2012 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/.
 
 require source.fs
 
@@ -24,38 +23,47 @@ variable assert-level ( -- a-addr ) \ gf
 \G All assertions above this level are turned off.
 1 assert-level !
 
+: (end-assert) ( flag nfile nline -- ) \ gforth-internal
+    rot if
+	2drop
+    else
+	.sourcepos ." : failed assertion"
+	true abort" assertion failed" \ !! or use a new throw code?
+    then ;
+
+: assert) ( -- )
+    compile-sourcepos POSTPONE (end-assert) ;
+
+6 Constant assert-canary
+
 : assertn ( n -- ) \ gforth assert-n
     \ this is internal (it is not immediate)
     assert-level @ >
     if
 	POSTPONE (
+    else
+	['] assert) assert-canary
     then ;
 
+: )  ( -- ) \ gforth	close-paren
+    \G End an assertion. Generic end, can be used for other similar purposes
+    assert-canary <> abort" unmatched assertion"
+    execute ; immediate
+
 : assert0( ( -- ) \ gforth assert-zero
     \G Important assertions that should always be turned on.
-    0 assertn ; immediate
+    0 assertn ; immediate compile-only
 : assert1( ( -- ) \ gforth assert-one
     \G Normal assertions; turned on by default.
-    1 assertn ; immediate
+    1 assertn ; immediate compile-only
 : assert2( ( -- ) \ gforth assert-two
     \G Debugging assertions.
-    2 assertn ; immediate
+    2 assertn ; immediate compile-only
 : assert3( ( -- ) \ gforth assert-three
     \G Slow assertions that you may not want to turn on in normal debugging;
     \G you would turn them on mainly for thorough checking.
-    3 assertn ; immediate
+    3 assertn ; immediate compile-only
 : assert( ( -- ) \ gforth
     \G Equivalent to @code{assert1(}
-    POSTPONE assert1( ; immediate
-
-: (end-assert) ( flag nfile nline -- ) \ gforth-internal
-    rot if
-	2drop
-    else
-	.sourcepos ." : failed assertion"
-	true abort" assertion failed" \ !! or use a new throw code?
-    then ;
+    POSTPONE assert1( ; immediate compile-only
 
-: ) ( -- ) \ gforth	close-paren
-\G End an assertion.
-    compile-sourcepos POSTPONE (end-assert) ; immediate