--- gforth/debugs.fs	2007/02/23 22:33:21	1.16
+++ gforth/debugs.fs	2011/12/31 15:29:25	1.24
@@ -1,12 +1,12 @@
 \ Simple debugging aids
 
-\ Copyright (C) 1995,1997,1999,2002,2003,2004,2005,2006 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., 59 Temple Place, Suite 330, Boston, MA 02111, 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
@@ -50,16 +49,28 @@ defer .debugline ( nfile nline -- ) \ gf
     printdebugdata
     cr ;
 
+stderr value debug-fid ( -- fid )
+\G (value) Debugging output prints to this file
+
 ' (.debugline) IS .debugline
 
-: .debugline-stderr ( nfile nline -- )
-    ['] .debugline stderr outfile-execute ;
+: .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-stderr ;
+    current-sourcepos .debugline-directed ;
 :noname ( compilation  -- ; run-time  -- )
-    compile-sourcepos POSTPONE .debugline-stderr ;
+    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