--- gforth/debugs.fs	1998/12/08 22:02:39	1.3
+++ gforth/debugs.fs	2012/08/09 23:58:52	1.25
@@ -1,12 +1,12 @@
 \ Simple debugging aids
 
-\ Copyright (C) 1995,1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,1999,2002,2003,2004,2005,2006,2007,2009,2011 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
@@ -36,23 +35,44 @@
 
 require source.fs
 
-defer printdebugdata ( -- ) \ gforth
+defer printdebugdata ( -- ) \ gforth print-debug-data
 ' .s IS printdebugdata
-defer printdebugline ( addr -- ) \ gforth
+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
-
-: (~~) ( -- )
-    r@ printdebugline
-    r> sourcepos %size + >r ;
-
-: ~~ ( compilation  -- ; run-time  -- ) \ gforth tilde-tilde
-    POSTPONE (~~) sourcepos, ; immediate
+[IFUNDEF] debug-fid
+stderr value debug-fid ( -- fid )
+\G (value) Debugging output prints to this file
+[THEN]
+
+' (.debugline) IS .debugline
+
+: .debugline-directed ( nfile nline -- )
+    action-of type action-of emit { oldtype oldemit }
+    try
+	['] (type) is type ['] (emit) is emit
+	['] .debugline debug-fid outfile-execute
+	0
+    restore
+	oldemit is emit oldtype is type
+    endtry
+    throw ;
+
+: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}.
 
+:noname ( -- )  stderr to debug-fid  defers 'cold ; IS 'cold