--- gforth/assert.fs	1999/03/23 20:24:16	1.8
+++ gforth/assert.fs	2010/04/07 20:46:27	1.16
@@ -1,12 +1,12 @@
 \ assertions
 
-\ Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1999,2002,2003,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., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 require source.fs
 
@@ -33,30 +32,29 @@ variable assert-level ( -- a-addr ) \ gf
 
 : 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
+    POSTPONE assert1( ; immediate compile-only
 
-: (endassert) ( flag -- ) \ gforth-internal
-    \ inline argument sourcepos
-    if
-	r> sourcepos %size + >r EXIT
+: (end-assert) ( flag nfile nline -- ) \ gforth-internal
+    rot if
+	2drop
     else
-	r> print-sourcepos ." : failed assertion"
+	.sourcepos ." : failed assertion"
 	true abort" assertion failed" \ !! or use a new throw code?
     then ;
 
 : ) ( -- ) \ gforth	close-paren
-    \G End an assertion.
-    POSTPONE (endassert) sourcepos, ; immediate
+\G End an assertion.
+    compile-sourcepos POSTPONE (end-assert) ; immediate