--- gforth/stuff.fs	2006/05/07 05:46:47	1.51
+++ gforth/stuff.fs	2011/10/06 20:04:35	1.68
@@ -1,12 +1,12 @@
 \ miscelleneous words
 
-\ Copyright (C) 1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
+\ Copyright (C) 1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010 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
 
@@ -149,14 +148,16 @@ 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 ['] noop
@@ -177,12 +178,44 @@ AUser CSP
 	THEN
     then ;
 
-: ]] ( -- )
-    \ switch into postpone state
+: ]] ( -- ) \ gforth right-bracket-bracket
+    \G switch into postpone state
     ['] postponer1 is parser1 state on ; immediate restrict
+[then]
 
+[ifdef] compiler-r
+: postponer-r ( addr u -- ... xt )
+    forth-recognizer do-recognizer
+    over [ s" [[" find-name ] Literal =
+    IF  2drop [comp'] ] drop ELSE  ['] >postpone  THEN ;
+
+: ]] ( -- ) \ gforth right-bracket-bracket
+    \G switch into postpone state
+    ['] postponer-r is parser1 state on ; immediate restrict
 [then]
 
+comp'  literal drop alias postpone-literal
+comp' 2literal drop alias postpone-2literal
+comp' fliteral drop alias postpone-fliteral
+comp' sliteral drop alias 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
+
 \ f.rdp
 
 : push-right ( c-addr u1 u2 cfill -- )
@@ -351,4 +384,82 @@ previous
 ' uw@ alias w@ ( addr -- u )
 ' ul@ alias l@ ( addr -- u )
 \ ' sw@ alias <w@ ( addr -- n )
-[then]
\ No newline at end of file
+[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
+
+\ WORD SWORD
+
+: sword  ( char -- addr len ) \ gforth-obsolete s-word
+\G Parses like @code{word}, but the output is like @code{parse} output.
+\G @xref{core-idef}.
+    \ this word was called PARSE-WORD until 0.3.0, but Open Firmware and
+    \ dpANS6 A.6.2.2008 have a word with that name that behaves
+    \ differently (like NAME).
+    source 2dup >r >r >in @ over min /string
+    rot dup bl = IF
+        drop (parse-white)
+    ELSE
+        (word)
+    THEN
+[ has? new-input [IF] ]
+    2dup input-lexeme!
+[ [THEN] ]
+    2dup + r> - 1+ r> min >in ! ;
+
+: word   ( char "<chars>ccc<char>-- c-addr ) \ core
+    \G Skip leading delimiters. Parse @i{ccc}, delimited by
+    \G @i{char}, in the parse area. @i{c-addr} is the address of a
+    \G transient region containing the parsed string in
+    \G counted-string format. If the parse area was empty or
+    \G contained no characters other than delimiters, the resulting
+    \G string has zero length. A program may replace characters within
+    \G the counted string. OBSOLESCENT: the counted string has a
+    \G trailing space that is not included in its length.
+    sword here place  bl here count + c!  here ;