--- gforth/extend.fs	2000/09/09 20:32:58	1.42
+++ gforth/extend.fs	2002/12/13 15:49:53	1.48
@@ -1,6 +1,6 @@
 \ EXTEND.FS    CORE-EXT Word not fully tested!         12may93jaw
 
-\ Copyright (C) 1995,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 
 \ May be cross-compiled
@@ -73,11 +73,6 @@ decimal
 
 \ C"                                                    17may93jaw
 
-: (c")     "lit ;
-
-: CLiteral
-    postpone (c") here over char+ allot  place align ; immediate restrict
-
 : C" ( compilation "ccc<quote>" -- ; run-time  -- c-addr ) \ core-ext c-quote
     \G Compilation: parse a string @i{ccc} delimited by a @code{"}
     \G (double quote). At run-time, return @i{c-addr} which
@@ -132,6 +127,7 @@ decimal
 
 \ SOURCE-ID SAVE-INPUT RESTORE-INPUT                    11jun93jaw
 
+[IFUNDEF] source-id
 : source-id ( -- 0 | -1 | fileid ) \ core-ext,file source-i-d
     \G Return 0 (the input source is the user input device), -1 (the
     \G input source is a string being processed by @code{evaluate}) or
@@ -146,7 +142,8 @@ decimal
     >in @
     loadfile @
     if
-	loadfile @ file-position throw #fill-bytes @ 0 d- \ !! bug for CRLF and EOF
+	loadfile @ file-position throw
+	[IFDEF] #fill-bytes #fill-bytes @ [ELSE] #tib @ 1+ [THEN] 0 d-
     else
 	blk @
 	linestart @
@@ -180,7 +177,7 @@ decimal
     r> loadline !
     >in !
     false ;
-
+[THEN]
 \ This things we don't need, but for being complete... jaw
 
 \ EXPECT SPAN                                           17may93jaw
@@ -239,7 +236,9 @@ variable span ( -- c-addr ) \ core-ext
     REPEAT
     drop
     \ remember udp
-    udp @ , ;
+    udp @ ,
+    \ remember dyncode-ptr
+    here ['] noop , compile-prim1 finish-code ;
 
 : marker! ( mark -- )
     \ reset included files count; resize will happen on next add-included-file
@@ -266,6 +265,7 @@ variable span ( -- c-addr ) \ core-ext
     REPEAT
     drop
     \ restore udp and dp
+    dup cell+ @ forget-dyncode 0= abort" gforth bug"
     @ udp !  dp !
     \ clean up vocabulary stack
     0 vp @ 0