Diff for /gforth/stuff.fs between versions 1.62 and 1.72

version 1.62, 2009/10/05 15:54:28 version 1.72, 2012/02/09 18:23:29
Line 1 Line 1
 \ miscelleneous words  \ 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.  \ This file is part of Gforth.
   
Line 17 Line 17
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program. If not, see http://www.gnu.org/licenses/.  \ along with this program. If not, see http://www.gnu.org/licenses/.
   
 require glocals.fs  : save-mem-dict ( addr1 u -- addr2 u )
       here swap dup allot ( addr1 addr2 u )
       2dup 2>r move 2r> ;
   
   ' usable-dictionary-end @ dodefer: = [if]
       require glocals.fs
   [else]
       require glocals-1.60.fs
   [then]
   
   
 ' require alias needs ( ... "name" -- ... ) \ gforth  ' require alias needs ( ... "name" -- ... ) \ gforth
 \G An alias for @code{require}; exists on other systems (e.g., Win32Forth).  \G An alias for @code{require}; exists on other systems (e.g., Win32Forth).
Line 136  AUser CSP Line 145  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 -- )  : compile-literal ( n -- )
     postpone literal ;      postpone literal ;
   
Line 148  AUser CSP Line 163  AUser CSP
 : compile-compile-2literal ( n1 n2 -- )  : compile-compile-2literal ( n1 n2 -- )
     compile-2literal postpone compile-2literal ;      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  
   
 [ifdef] compiler1  
 : postponer1 ( c-addr u -- ... xt )  : postponer1 ( c-addr u -- ... xt )
     2dup find-name      2dup find-name
     [ifdef] run-prelude run-prelude [then]      [ifdef] run-prelude run-prelude [then]
Line 178  AUser CSP Line 187  AUser CSP
         THEN          THEN
     then ;      then ;
   
 : ]] ( -- )  : ]] ( -- ) \ gforth right-bracket-bracket
     \ switch into postpone state      \G switch into postpone state
     ['] postponer1 is parser1 state on ; immediate restrict      ['] 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]  [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  \ f.rdp
   
 : push-right ( c-addr u1 u2 cfill -- )  : push-right ( c-addr u1 u2 cfill -- )
Line 401  previous Line 442  previous
     source-id dup 0> IF      source-id dup 0> IF
         >r r@ file-size throw r> reposition-file throw          >r r@ file-size throw r> reposition-file throw
         BEGIN  refill 0= UNTIL  postpone \  THEN ; immediate          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 ;
   
   \ quotations
   
   :noname  false :noname ;
   :noname  locals-wordlist last @ lastcfa @
       postpone AHEAD
       locals-list @ locals-list off
       postpone SCOPE
       true  :noname  ;
   interpret/compile: [: ( compile-time: -- quotation-sys ) \ gforth bracket-colon
   \G Starts a quotation
   
   : ;] ( compile-time: quotation-sys -- ; run-time: -- xt ) \ gforth semi-bracket
       \g ends a quotation
       POSTPONE ; >r IF
           ]  postpone ENDSCOPE
           locals-list !
           postpone THEN
           lastcfa ! last ! to locals-wordlist
           r> postpone ALiteral
       ELSE  r>  THEN ( xt ) ; immediate

Removed from v.1.62  
changed lines
  Added in v.1.72


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>