Diff for /gforth/stuff.fs between versions 1.37 and 1.66

version 1.37, 2004/11/28 20:20:37 version 1.66, 2010/03/18 14:45:54
Line 1 Line 1
 \ miscelleneous words  \ miscelleneous words
   
 \ Copyright (C) 1996,1997,1998,2000,2003 Free Software Foundation, Inc.  \ Copyright (C) 1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ 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.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ 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, write to the Free Software  \ along with this program. If not, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   
 require glocals.fs  require glocals.fs
   
Line 123  AUser CSP Line 122  AUser CSP
     2dup r@ read-file throw over <> abort" could not read whole file"      2dup r@ read-file throw over <> abort" could not read whole file"
     r> close-file throw ;      r> close-file throw ;
   
 : slurp-fid { fid -- addr u } \ gforth  : slurp-fid ( fid -- addr u ) \ gforth
     \G @var{addr u} is the content of the file @var{fid}  \G @var{addr u} is the content of the file @var{fid}
       { fid }
     0 0 begin ( awhole uwhole )      0 0 begin ( awhole uwhole )
         dup 1024 + dup >r extend-mem ( anew awhole uwhole R: unew )          dup 1024 + dup >r extend-mem ( anew awhole uwhole R: unew )
         rot r@ fid read-file throw ( awhole uwhole uread R: unew )          rot r@ fid read-file throw ( awhole uwhole uread R: unew )
Line 139  AUser CSP Line 139  AUser CSP
 : compile-literal ( n -- )  : compile-literal ( n -- )
     postpone literal ;      postpone literal ;
   
 : [[ ( -- )  : compile-compile-literal ( n -- )
       compile-literal postpone compile-literal ;
   
   : compile-2literal ( n1 n2 -- )
       postpone 2literal ;
   
   : compile-compile-2literal ( n1 n2 -- )
       compile-2literal postpone compile-2literal ;
   
   : [[ ( -- ) \ gforth left-bracket-bracket
 \G switch from postpone state to compile state  \G switch from postpone state to compile state
     \ this is only a marker; it is never really interpreted      \ this is only a marker; it is never really interpreted
     compile-only-error ; immediate      compile-only-error ; immediate
   
 : postponer ( c-addr u -- )  [ifdef] compiler1
     2dup find-name dup if ( c-addr u nt )  : postponer1 ( c-addr u -- ... xt )
       2dup find-name
       [ifdef] run-prelude run-prelude [then]
       dup if ( c-addr u nt )
         nip nip name>comp          nip nip name>comp
         2dup [comp'] [[ d= if          2dup [comp'] [[ d= if
             2drop ['] compiler is parser              2drop ['] compiler1 is parser1 ['] noop
         else          else
             postpone,              ['] postpone,
         endif          endif
     else      else
         drop          drop
         2dup snumber? dup if          2dup 2>r snumber? dup if
             0> IF              0> IF
                 swap postpone literal postpone compile-literal                  ['] compile-compile-2literal
               ELSE
                   ['] compile-compile-literal
             THEN              THEN
             postpone Literal postpone compile-literal              2rdrop
             2drop  
         ELSE          ELSE
             drop no.extensions              drop 2r> no.extensions
         THEN          THEN
     then ;      then ;
   
 : ]] ( -- )  : ]] ( -- ) \ gforth right-bracket-bracket
     \ switch into postpone state      \G switch into postpone state
     ['] postponer is parser state on ; immediate restrict      ['] 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  \ f.rdp
   
Line 186  AUser CSP Line 223  AUser CSP
         ur nd - 1- dup { beforep } fsign + nexp 0 max >= and if          ur nd - 1- dup { beforep } fsign + nexp 0 max >= and if
             \ fixed-point notation              \ fixed-point notation
             c-addr ur beforep nexp - dup { befored } '0 push-right              c-addr ur beforep nexp - dup { befored } '0 push-right
               befored 1+ ur >= if \ <=1 digit left, will be pushed out by '.'
                   rf fabs f2* 0.1e nd s>d d>f f** f> if \ round last digit
                       '1 c-addr befored + 1- c!
                   endif
               endif
             c-addr beforep 1- befored min dup { beforez } 0 max bl fill              c-addr beforep 1- befored min dup { beforez } 0 max bl fill
             fsign if              fsign if
                 '- c-addr beforez 1- 0 max + c!                  '- c-addr beforez 1- 0 max + c!
Line 282  AUser CSP Line 324  AUser CSP
 [then]  [then]
   
 : f.s ( -- ) \ gforth f-dot-s  : f.s ( -- ) \ gforth f-dot-s
     \G Display the number of items on the floating-point stack,  \G Display the number of items on the floating-point stack, followed
     \G followed by a list of the items; TOS is the right-most item.  \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       ." <" 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 ;       ?DO  dup i - 1- floats fp@ + f@ 16 5 11 f.rdp space LOOP  drop ; 
   
 \ defer stuff  \ defer stuff
   
   [ifundef] defer@ : defer@ >body @ ; [then]
   
 :noname    ' defer@ ;  :noname    ' defer@ ;
 :noname    postpone ['] postpone defer@ ;  :noname    postpone ['] postpone defer@ ;
 interpret/compile: action-of ( interpretation "name" -- xt; compilation "name" -- ; run-time -- xt ) \ gforth  interpret/compile: action-of ( interpretation "name" -- xt; compilation "name" -- ; run-time -- xt ) \ gforth
Line 297  interpret/compile: action-of ( interpret Line 342  interpret/compile: action-of ( interpret
 ' action-of  ' action-of
 comp' action-of drop  comp' action-of drop
 interpret/compile: what's ( interpretation "name" -- xt; compilation "name" -- ; run-time -- xt ) \ gforth-obsolete  interpret/compile: what's ( interpretation "name" -- xt; compilation "name" -- ; run-time -- xt ) \ gforth-obsolete
 \G Old name of @code{action-of}  
   
   \G Old name of @code{action-of}
   
   
   : typewhite ( addr n -- ) \ gforth
   \G Like type, but white space is printed instead of the characters.
       \ bounds u+do
       0 max bounds ?do
           i c@ #tab = if \ check for tab
               #tab
           else
               bl
           then
           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
   
   \ 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 ;

Removed from v.1.37  
changed lines
  Added in v.1.66


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