--- gforth/source.fs	1995/11/07 18:08:47	1.1
+++ gforth/source.fs	2011/12/31 15:29:25	1.23
@@ -1,12 +1,12 @@
 \ source location handling
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,2003,2004,2007,2009,2011 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,30 +15,65 @@
 \ 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
+\ related stuff can be found in kernel.fs
 
-\ related stuff can be found in kernal.fs
+\ this stuff is used by (at least) assert.fs and debugs.fs
 
-\ this stuff is used by (at least) assert.fs and debugging.fs
+: loadfilename#>str ( n -- addr u )
+    included-files 2@ rot min 2* cells + 2@ ;
 
-require struct.fs
-
-struct
-    1 cells: field sourcepos-name#
-    1 cells: field sourcepos-line#
-end-struct sourcepos
-    
-: sourcepos, ( -- )
-    \ record the current source position HERE
-    loadfilename# @ , loadline @ , ;
-
-: 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@
-    rot sourcepos-line# @ ;
-
-: print-sourcepos ( a-addr -- )
-    get-sourcepos
-    >r type ." :" r> 0 .r ;
+: 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 -1 ;
+
+\ we encode line and character in one cell to keep the interface the same
+: encode-pos ( nline nchar -- npos )
+    $ff min swap 8 lshift + ;
+
+: decode-pos ( npos -- nline nchar )
+    dup 8 rshift swap $ff and ;
+
+: current-sourcepos ( -- nfile npos )
+    sourcefilename  str>loadfilename# sourceline# >in @ encode-pos ;
+
+: compile-sourcepos ( compile-time: -- ; run-time: -- nfile npos )
+    \ compile the current source position as literals: nfile is the
+    \ source file index, nline the line number within the file.
+    current-sourcepos
+    swap postpone literal
+    postpone literal ;
+
+: .sourcepos ( nfile npos -- )
+    \ print source position
+    swap loadfilename#>str type ': emit
+    base @ decimal
+    swap decode-pos swap 0 .r ': emit 0 .r
+    base ! ;
+
+: save-source-filename ( c-addr1 u1 -- c-addr2 u2 )
+    \ c-addr1 u1 is a temporary string for a file name, c-addr2 u2 is
+    \ a permanent one.  Reuses strings for the same file names and
+    \ adds them to the included files (not sure if that's a good idea)
+    2dup str>loadfilename# dup 0< if
+	drop save-mem 2dup add-included-file
+    else
+	nip nip loadfilename#>str
+    then ;
+
+: #line ( "u" "["file"]" -- )
+    \g Set the line number to @i{u} and (if present) the file name to @i{file}.  Consumes the rest of the line.
+    \g 
+    parse-name ['] evaluate 10 base-execute 1- loadline !
+    '"' parse 2drop '"' parse dup if
+	save-source-filename loadfilename 2!
+    else
+	2drop
+    then
+    postpone \ ;