--- gforth/assert.fs	1995/03/13 09:17:23	1.3
+++ gforth/assert.fs	2012/12/31 15:25:17	1.19
@@ -1,45 +1,69 @@
 \ assertions
 
-\ !! factor out line number printing, share with debugging.fs
+\ Copyright (C) 1995,1996,1997,1999,2002,2003,2007,2010,2012 Free Software Foundation, Inc.
 
-variable assert-level ( -- a-addr ) \ new
-\G all assertions above this level are turned off
+\ 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 3
+\ of the License, or (at your option) any later version.
+
+\ This program is distributed in the hope that it will be useful,
+\ but WITHOUT ANY WARRANTY; without even the implied warranty of
+\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\ 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, see http://www.gnu.org/licenses/.
+
+require source.fs
+
+variable assert-level ( -- a-addr ) \ gforth
+\G All assertions above this level are turned off.
 1 assert-level !
 
-: assertn ( n -- ) \ new
-    \ this is internal (it is not immediate)
-    assert-level @ >
-    if
-	POSTPONE (
+: (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 ;
 
-: assert0( ( -- ) \ new
-    \G important assertions that should always be turned on
-    0 assertn ; immediate
-: assert1( ( -- ) \ new
-    \G normal assertions; turned on by default
-    1 assertn ; immediate
-: assert2( ( -- ) \ new
-    \G debugging assertions
-    2 assertn ; immediate
-: assert3( ( -- ) \ new
-    \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
-: assert( ( -- ) \ new
-    \G equivalent to assert1(
-    POSTPONE assert1( ; immediate
+: assert) ( -- )
+    compile-sourcepos POSTPONE (end-assert) ;
 
-: (endassert) ( flag -- ) \ new
-    \ three inline arguments
+6 Constant assert-canary
+
+: assertn ( n -- ) \ gforth assert-n
+    \ this is internal (it is not immediate)
+    assert-level @ >
     if
-	r> 3 cells + >r EXIT
+	POSTPONE (
     else
-	r>
-	dup 2@ type ." :" cell+ cell+
-	@ 0 .r ." : failed assertion"
-	true abort" assertion failed" \ !! or use a new throw code?
+	['] assert) assert-canary
     then ;
 
-: ) ( -- ) \ new
-    POSTPONE (endassert) loadfilename 2@ 2, loadline @ , ; immediate
+: )  ( -- ) \ 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 compile-only
+: assert1( ( -- ) \ gforth assert-one
+    \G Normal assertions; turned on by default.
+    1 assertn ; immediate compile-only
+: assert2( ( -- ) \ gforth assert-two
+    \G Debugging assertions.
+    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 compile-only
+: assert( ( -- ) \ gforth
+    \G Equivalent to @code{assert1(}
+    POSTPONE assert1( ; immediate compile-only
+