--- gforth/source.fs	2003/01/20 19:17:59	1.10
+++ gforth/source.fs	2004/08/23 14:03:52	1.16
@@ -1,6 +1,6 @@
 \ source location handling
 
-\ Copyright (C) 1995,1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -23,7 +23,7 @@
 \ this stuff is used by (at least) assert.fs and debugs.fs
 
 : loadfilename#>str ( n -- addr u )
-    included-files 2@ drop swap 2* cells + 2@ ;
+    included-files 2@ rot min 2* cells + 2@ ;
 
 : str>loadfilename# ( addr u -- n )
     included-files 2@ 0 ?do ( addr u included-files )
@@ -32,15 +32,18 @@
 	    rdrop 2drop i unloop exit
 	endif
 	r> loop
-    drop 2drop 3 ;
+    drop 2drop 0 ;
+
+: current-sourcepos ( -- nfile nline )
+    sourcefilename  str>loadfilename# sourceline# ;
 
 : compile-sourcepos ( compile-time: -- ; run-time: -- nfile nline )
     \ compile the current source position as literals: nfile is the
     \ source file index, nline the line number within the file.
-    loadfilename 2@ str>loadfilename# postpone literal
-    sourceline# postpone literal ;
+    current-sourcepos swap postpone literal postpone literal ;
 
 : .sourcepos ( nfile nline -- )
     \ print source position
     swap loadfilename#>str type ." :"
     base @ decimal swap 0 .r base ! ;
+