--- gforth/stuff.fs	2009/11/28 21:19:34	1.63
+++ gforth/stuff.fs	2011/12/31 15:29:25	1.70
@@ -1,6 +1,6 @@
 \ miscelleneous words
 
-\ Copyright (C) 1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+\ Copyright (C) 1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -136,6 +136,12 @@ AUser CSP
 
 \ ]] ... [[
 
+: [[ ( -- ) \ 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
 : compile-literal ( n -- )
     postpone literal ;
 
@@ -148,12 +154,6 @@ 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
     [ifdef] run-prelude run-prelude [then]
@@ -181,11 +181,23 @@ AUser CSP
 : ]] ( -- ) \ 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 ;
 
-: postpone-literal  postpone  literal ;
-: postpone-2literal postpone 2literal ;
-: postpone-fliteral postpone fliteral ;
-: postpone-sliteral postpone sliteral ;
+: ]] ( -- ) \ 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}.
@@ -204,8 +216,6 @@ AUser CSP
 \G allocated permanently, you can use @code{]]2L} instead.
     ]] postpone-sliteral ]] [[ ; immediate
 
-[then]
-
 \ f.rdp
 
 : push-right ( c-addr u1 u2 cfill -- )
@@ -423,3 +433,33 @@ previous
     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 ;