--- gforth/source.fs	2004/05/14 17:09:22	1.15
+++ gforth/source.fs	2009/12/31 15:32:35	1.21
@@ -1,12 +1,12 @@
 \ source location handling
 
-\ Copyright (C) 1995,1997,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,2003,2004,2007,2009 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,8 +15,7 @@
 \ 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
 
@@ -34,16 +33,28 @@
 	r> loop
     drop 2drop 0 ;
 
-: current-sourcepos ( -- )
-    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 ! ;
+