--- gforth/source.fs	1997/05/21 20:39:40	1.5
+++ gforth/source.fs	2003/01/22 10:59:54	1.13
@@ -1,6 +1,6 @@
 \ source location handling
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,30 +16,31 @@
 
 \ 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.
 
 \ related stuff can be found in kernel.fs
 
-\ this stuff is used by (at least) assert.fs and debugging.fs
+\ this stuff is used by (at least) assert.fs and debugs.fs
 
-require struct.fs
+: loadfilename#>str ( n -- addr u )
+    included-files 2@ rot min 2* cells + 2@ ;
 
-struct
-    1 cells: field sourcepos-name#
-    1 cells: field sourcepos-line#
-end-struct sourcepos
-    
-: sourcepos, ( -- )
-    \ record the current source position HERE
-    loadfilename# @ , sourceline# , ;
-
-: get-sourcepos ( a-addr -- c-addr u n )
-    \ c-addr u is the filename, n is the line number
-    dup sourcepos-name# @ loadfilename#>str
-    rot sourcepos-line# @ ;
-
-: print-sourcepos ( a-addr -- )
-    get-sourcepos
-    >r type ." :"
-    base @ decimal r> 0 .r base ! ;
+: str>loadfilename# ( addr u -- n )
+    included-files 2@ 0 ?do ( addr u included-files )
+	i over >r 2* cells + 2@
+	2over str= if
+	    rdrop 2drop i unloop exit
+	endif
+	r> loop
+    drop 2drop 0 ;
+
+: 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.
+    sourcefilename str>loadfilename# postpone literal
+    sourceline# postpone literal ;
+
+: .sourcepos ( nfile nline -- )
+    \ print source position
+    swap loadfilename#>str type ." :"
+    base @ decimal swap 0 .r base ! ;