Diff for /gforth/stuff.fs between versions 1.41 and 1.60

version 1.41, 2004/12/31 13:23:58 version 1.60, 2009/09/05 17:38:37
Line 1 Line 1
 \ miscelleneous words  \ miscelleneous words
   
 \ Copyright (C) 1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.  \ Copyright (C) 1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 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 ;
   
 : [[ ( -- )  : [[ ( -- )
 \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
       [ifdef] find-name-run-prelude find-name-run-prelude [else] find-name [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 ;
   
 : ]] ( -- )  : ]] ( -- )
     \ switch into postpone state      \ switch into postpone state
     ['] postponer is parser state on ; immediate restrict      ['] postponer1 is parser1 state on ; immediate restrict
   
   [then]
   
 \ f.rdp  \ f.rdp
   
Line 186  AUser CSP Line 201  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 302  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 ; 
   
Line 314  interpret/compile: what's ( interpretati Line 335  interpret/compile: what's ( interpretati
         emit          emit
     loop ;      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 + ;

Removed from v.1.41  
changed lines
  Added in v.1.60


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