--- gforth/source.fs	2007/12/31 19:02:24	1.19
+++ gforth/source.fs	2011/08/19 17:58:20	1.22
@@ -1,6 +1,6 @@
 \ source location handling
 
-\ Copyright (C) 1995,1997,2003,2004,2007 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,2003,2004,2007,2009 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -31,18 +31,49 @@
 	    rdrop 2drop i unloop exit
 	endif
 	r> loop
-    drop 2drop 0 ;
+    drop 2drop -1 ;
 
-: current-sourcepos ( -- nfile nline )
-    sourcefilename  str>loadfilename# sourceline# ;
+\ we encode line and character in one cell to keep the interface the same
+: encode-pos ( nline nchar -- npos )
+    $ff min swap 8 lshift + ;
 
-: compile-sourcepos ( compile-time: -- ; run-time: -- nfile nline )
+: 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 ;
+    current-sourcepos
+    swap postpone literal
+    postpone literal ;
 
-: .sourcepos ( nfile nline -- )
+: .sourcepos ( nfile npos -- )
     \ print source position
-    swap loadfilename#>str type ." :"
-    base @ decimal swap 0 .r base ! ;
-
+    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 \ ;