--- gforth/source.fs	2003/01/20 22:16:04	1.11
+++ gforth/source.fs	2007/12/31 19:02:24	1.19
@@ -1,12 +1,12 @@
 \ source location handling
 
-\ Copyright (C) 1995,1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,2003,2004,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,15 +15,14 @@
 \ GNU General Public License for more details.
 
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 \ related stuff can be found in kernel.fs
 
 \ 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 )
@@ -34,13 +33,16 @@
 	r> loop
     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 ! ;
+