--- gforth/stuff.fs	2004/11/28 20:35:06	1.38
+++ gforth/stuff.fs	2005/10/02 11:30:32	1.45
@@ -1,6 +1,6 @@
 \ miscelleneous words
 
-\ Copyright (C) 1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -123,8 +123,9 @@ AUser CSP
     2dup r@ read-file throw over <> abort" could not read whole file"
     r> close-file throw ;
 
-: slurp-fid { fid -- addr u } \ gforth
-    \G @var{addr u} is the content of the file @var{fid}
+: slurp-fid ( fid -- addr u ) \ gforth
+\G @var{addr u} is the content of the file @var{fid}
+    { fid }
     0 0 begin ( awhole uwhole )
 	dup 1024 + dup >r extend-mem ( anew awhole uwhole R: unew )
 	rot r@ fid read-file throw ( awhole uwhole uread R: unew )
@@ -139,35 +140,48 @@ AUser CSP
 : compile-literal ( n -- )
     postpone literal ;
 
+: compile-compile-literal ( n -- )
+    compile-literal postpone compile-literal ;
+
+: compile-2literal ( n1 n2 -- )
+    postpone 2literal ;
+
+: compile-compile-2literal ( n1 n2 -- )
+    compile-2literal postpone compile-2literal ;
+
 : [[ ( -- )
 \G switch from postpone state to compile state
     \ this is only a marker; it is never really interpreted
     compile-only-error ; immediate
 
-: postponer ( c-addr u -- )
+[ifdef] compiler1
+: postponer1 ( c-addr u -- ... xt )
     2dup find-name dup if ( c-addr u nt )
 	nip nip name>comp
 	2dup [comp'] [[ d= if
-	    2drop ['] compiler is parser
+	    2drop ['] compiler1 is parser1
 	else
-	    postpone,
+	    ['] postpone,
 	endif
     else
 	drop
-	2dup snumber? dup if
+	2dup 2>r snumber? dup if
 	    0> IF
-		swap postpone literal postpone compile-literal
+		['] compile-compile-2literal
+            ELSE
+                ['] compile-compile-literal
 	    THEN
-	    postpone Literal postpone compile-literal
-	    2drop
+	    2rdrop
 	ELSE
-	    drop no.extensions
+	    drop 2r> no.extensions
 	THEN
     then ;
 
 : ]] ( -- )
     \ switch into postpone state
-    ['] postponer is parser state on ; immediate restrict
+    ['] postponer1 is parser1 state on ; immediate restrict
+
+[then]
 
 \ f.rdp
 
@@ -186,6 +200,11 @@ AUser CSP
 	ur nd - 1- dup { beforep } fsign + nexp 0 max >= and if
 	    \ fixed-point notation
 	    c-addr ur beforep nexp - dup { befored } '0 push-right
+            befored 1+ ur >= if \ <=1 digit left, will be pushed out by '.'
+                rf fabs f2* 0.1e nd s>d d>f f** f> if \ round last digit
+                    '1 c-addr befored + 1- c!
+                endif
+            endif
 	    c-addr beforep 1- befored min dup { beforez } 0 max bl fill
 	    fsign if
 		'- c-addr beforez 1- 0 max + c!
@@ -289,6 +308,8 @@ AUser CSP
 
 \ defer stuff
 
+[ifundef] defer@ : defer@ >body @ ; [then]
+
 :noname    ' defer@ ;
 :noname    postpone ['] postpone defer@ ;
 interpret/compile: action-of ( interpretation "name" -- xt; compilation "name" -- ; run-time -- xt ) \ gforth
@@ -298,3 +319,17 @@ interpret/compile: action-of ( interpret
 comp' action-of drop
 interpret/compile: what's ( interpretation "name" -- xt; compilation "name" -- ; run-time -- xt ) \ gforth-obsolete
 \G Old name of @code{action-of}
+
+
+: typewhite ( addr n -- ) \ gforth
+\G Like type, but white space is printed instead of the characters.
+    \ bounds u+do
+    0 max bounds ?do
+	i c@ #tab = if \ check for tab
+	    #tab
+	else
+	    bl
+	then
+	emit
+    loop ;
+