--- gforth/source.fs	1995/11/29 20:20:37	1.2
+++ gforth/source.fs	1997/07/31 16:17:10	1.6
@@ -19,15 +19,15 @@
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-\ related stuff can be found in kernal.fs
+\ related stuff can be found in kernel.fs
 
 \ this stuff is used by (at least) assert.fs and debugging.fs
 
 require struct.fs
 
 struct
-    1 cells: field sourcepos-name#
-    1 cells: field sourcepos-line#
+    cell% field sourcepos-name#
+    cell% field sourcepos-line#
 end-struct sourcepos
     
 : sourcepos, ( -- )
@@ -36,9 +36,10 @@ end-struct sourcepos
 
 : get-sourcepos ( a-addr -- c-addr u n )
     \ c-addr u is the filename, n is the line number
-    included-files 2@ drop over sourcepos-name# @ 2* cells + 2@
+    dup sourcepos-name# @ loadfilename#>str
     rot sourcepos-line# @ ;
 
 : print-sourcepos ( a-addr -- )
     get-sourcepos
-    >r type ." :" r> 0 .r ;
+    >r type ." :"
+    base @ decimal r> 0 .r base ! ;