--- gforth/stuff.fs	2005/09/12 08:50:19	1.44
+++ gforth/stuff.fs	2009/11/28 21:19:34	1.63
@@ -1,12 +1,12 @@
 \ miscelleneous words
 
-\ Copyright (C) 1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
+\ Copyright (C) 1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 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/.
 
 require glocals.fs
 
@@ -123,8 +122,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 )
@@ -148,17 +148,19 @@ AUser CSP
 : compile-compile-2literal ( n1 n2 -- )
     compile-2literal postpone compile-2literal ;
 
-: [[ ( -- )
+: [[ ( -- ) \ gforth left-bracket-bracket
 \G switch from postpone state to compile state
     \ this is only a marker; it is never really interpreted
     compile-only-error ; immediate
 
 [ifdef] compiler1
 : postponer1 ( c-addr u -- ... xt )
-    2dup find-name dup if ( c-addr u nt )
+    2dup find-name
+    [ifdef] run-prelude run-prelude [then]
+    dup if ( c-addr u nt )
 	nip nip name>comp
 	2dup [comp'] [[ d= if
-	    2drop ['] compiler1 is parser1
+	    2drop ['] compiler1 is parser1 ['] noop
 	else
 	    ['] postpone,
 	endif
@@ -176,10 +178,32 @@ AUser CSP
 	THEN
     then ;
 
-: ]] ( -- )
-    \ switch into postpone state
+: ]] ( -- ) \ gforth right-bracket-bracket
+    \G switch into postpone state
     ['] postponer1 is parser1 state on ; immediate restrict
 
+: postpone-literal  postpone  literal ;
+: postpone-2literal postpone 2literal ;
+: postpone-fliteral postpone fliteral ;
+: postpone-sliteral postpone sliteral ;
+
+: ]]L ( postponing: x -- ; compiling: -- x ) \ gforth right-bracket-bracket-l
+\G Shortcut for @code{]] literal}.
+    ]] postpone-literal ]] [[ ; immediate
+
+: ]]2L ( postponing: x1 x2 -- ; compiling: -- x1 x2 ) \ gforth right-bracket-bracket-two-l
+\G Shortcut for @code{]] 2literal}.
+    ]] postpone-2literal ]] [[ ; immediate
+
+: ]]FL ( postponing: r -- ; compiling: -- r ) \ gforth right-bracket-bracket-f-l
+\G Shortcut for @code{]] fliteral}.
+    ]] postpone-fliteral ]] [[ ; immediate
+
+: ]]SL ( postponing: addr1 u -- ; compiling: -- addr2 u ) \ gforth right-bracket-bracket-s-l
+\G Shortcut for @code{]] sliteral}; if the string already has been
+\G allocated permanently, you can use @code{]]2L} instead.
+    ]] postpone-sliteral ]] [[ ; immediate
+
 [then]
 
 \ f.rdp
@@ -300,8 +324,9 @@ AUser CSP
 [then]
 
 : f.s ( -- ) \ gforth f-dot-s
-    \G Display the number of items on the floating-point stack,
-    \G followed by a list of the items; TOS is the right-most item.
+\G Display the number of items on the floating-point stack, followed
+\G by a list of the items (but not more than specified by
+\G @code{maxdepth-.s}; TOS is the right-most item.
     ." <" fdepth 0 .r ." > " fdepth 0 max maxdepth-.s @ min dup 0 
     ?DO  dup i - 1- floats fp@ + f@ 16 5 11 f.rdp space LOOP  drop ; 
 
@@ -332,3 +357,69 @@ interpret/compile: what's ( interpretati
 	emit
     loop ;
 
+\ w and l stuff
+
+environment-wordlist >order
+
+16 address-unit-bits / 1 max constant /w ( -- u ) \ gforth slash-w
+\G address units for a 16-bit value
+    
+32 address-unit-bits / 1 max constant /l ( -- u ) \ gforth slash-l
+\G address units for a 32-bit value
+
+previous
+
+[ifdef] uw@
+\ Open firmware names
+' uw@ alias w@ ( addr -- u )
+' ul@ alias l@ ( addr -- u )
+\ ' sw@ alias <w@ ( addr -- n )
+[then]
+
+\ safe output redirection
+
+: outfile-execute ( ... xt file-id -- ... ) \ gforth
+    \G execute @i{xt} with the output of @code{type} etc. redirected to
+    \G @i{file-id}.
+    outfile-id { oldfid } try
+	to outfile-id execute 0
+    restore
+	oldfid to outfile-id
+    endtry
+    throw ;
+
+: infile-execute ( ... xt file-id -- ... ) \ gforth
+    \G execute @i{xt} with the input of @code{key} etc. redirected to
+    \G @i{file-id}.
+    infile-id { oldfid } try
+	to infile-id execute 0
+    restore
+	oldfid to infile-id
+    endtry
+    throw ;
+
+\ safe BASE wrapper
+
+: base-execute ( i*x xt u -- j*x ) \ gforth
+    \G execute @i{xt} with the content of @code{BASE} being @i{u}, and
+    \G restoring the original @code{BASE} afterwards.
+    base @ { oldbase } \ use local, because TRY blocks the return stack
+    try
+	base ! execute 0
+    restore
+	oldbase base !
+    endtry
+    throw ;
+
+\ th
+
+: th ( addr1 u -- addr2 )
+    cells + ;
+
+\ \\\ - skip to end of file
+
+: \\\ ( -- ) \ gforth
+    \G skip remaining source file
+    source-id dup 0> IF
+	>r r@ file-size throw r> reposition-file throw
+	BEGIN  refill 0= UNTIL  postpone \  THEN ; immediate