--- gforth/debugs.fs	1998/12/08 22:02:39	1.3
+++ gforth/debugs.fs	2003/08/25 14:17:44	1.9
@@ -1,6 +1,6 @@
 \ Simple debugging aids
 
-\ Copyright (C) 1995,1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,1999,2002,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 
 \ They are meant to support a different style of debugging than the
@@ -36,23 +36,18 @@
 
 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
 
-: (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 ;
+' (.debugline) IS .debugline
 
 : ~~ ( compilation  -- ; run-time  -- ) \ gforth tilde-tilde
-    POSTPONE (~~) sourcepos, ; immediate
-
+    compile-sourcepos POSTPONE .debugline ; immediate