--- gforth/debugs.fs	2000/09/23 15:05:59	1.5
+++ gforth/debugs.fs	2009/02/20 19:32:35	1.20
@@ -1,12 +1,12 @@
 \ Simple debugging aids
 
-\ Copyright (C) 1995,1997,1999 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,1999,2002,2003,2004,2005,2006,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/.
 
 
 \ They are meant to support a different style of debugging than the
@@ -38,21 +37,31 @@ require source.fs
 
 defer printdebugdata ( -- ) \ gforth print-debug-data
 ' .s IS printdebugdata
-defer printdebugline ( addr -- ) \ gforth print-debug-line
+defer .debugline ( nfile nline -- ) \ gforth print-debug-line
+\G Print the source code location indicated by @var{nfile nline}, and
+\G additional debugging information; the default @code{.debugline}
+\G prints the additional information with @code{printdebugdata}.
 
-: (printdebugline) ( addr -- )
-    cr print-sourcepos ." :"
+: (.debugline) ( nfile nline -- )
+    cr .sourcepos ." :"
     \ it would be nice to print the name of the following word,
     \ but that's not easily possible for primitives
     printdebugdata
     cr ;
 
-' (printdebugline) IS printdebugline
+stderr value debug-fid ( -- fid )
+\G (value) Debugging output prints to this file
 
-: (~~) ( -- )
-    r@ printdebugline
-    r> sourcepos %size + >r ;
+' (.debugline) IS .debugline
 
-: ~~ ( compilation  -- ; run-time  -- ) \ gforth tilde-tilde
-    POSTPONE (~~) sourcepos, ; immediate
+: .debugline-directed ( nfile nline -- )
+    ['] .debugline debug-fid outfile-execute ;
+
+:noname ( -- )
+    current-sourcepos .debugline-directed ;
+:noname ( compilation  -- ; run-time  -- )
+    compile-sourcepos POSTPONE .debugline-directed ;
+interpret/compile: ~~ ( -- ) \ gforth tilde-tilde
+\G Prints the source code location of the @code{~~} and the stack
+\G contents with @code{.debugline}.