--- gforth/source.fs	2003/01/20 19:17:59	1.10
+++ gforth/source.fs	2003/01/22 10:59:54	1.13
@@ -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,12 +32,12 @@
 	    rdrop 2drop i unloop exit
 	endif
 	r> loop
-    drop 2drop 3 ;
+    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.
-    loadfilename 2@ str>loadfilename# postpone literal
+    sourcefilename str>loadfilename# postpone literal
     sourceline# postpone literal ;
 
 : .sourcepos ( nfile nline -- )