--- gforth/stuff.fs 2009/09/06 22:43:23 1.61 +++ gforth/stuff.fs 2010/12/31 18:09:02 1.67 @@ -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 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -148,7 +148,7 @@ 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 @@ -178,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 +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 + [then] \ f.rdp @@ -393,3 +415,41 @@ previous : 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 "ccc-- 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 ;