--- gforth/extend.fs 1997/01/04 16:32:28 1.19 +++ gforth/extend.fs 2003/01/20 17:07:37 1.52 @@ -1,6 +1,6 @@ \ EXTEND.FS CORE-EXT Word not fully tested! 12may93jaw -\ Copyright (C) 1995 Free Software Foundation, Inc. +\ Copyright (C) 1995,1998,2000 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -16,7 +16,7 @@ \ You should have received a copy of the GNU General Public License \ along with this program; if not, write to the Free Software -\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. \ May be cross-compiled @@ -25,21 +25,27 @@ decimal \ .( 12may93jaw -: .( ( compilation "..." -- ) \ core-ext dot-paren - [char] ) parse type ; immediate +: .( ( compilation&interpretation "ccc" -- ) \ core-ext dot-paren + \G Compilation and interpretation semantics: Parse a string @i{ccc} + \G delimited by a @code{)} (right parenthesis). Display the + \G string. This is often used to display progress information during + \G compilation; see examples below. + [char] ) parse type ; immediate \ VALUE 2>R 2R> 2R@ 17may93jaw -: value ( w "name" -- ) \ core-ext - (constant) , ; \ !! 2value : 2Literal ( compilation w1 w2 -- ; run-time -- w1 w2 ) \ double two-literal + \G Compile appropriate code such that, at run-time, cell pair @i{w1, w2} are + \G placed on the stack. Interpretation semantics are undefined. swap postpone Literal postpone Literal ; immediate restrict ' drop alias d>s ( d -- n ) \ double d_to_s -: m*/ ( d1 n2 u3 -- dqout ) \ double m-star-slash +: m*/ ( d1 n2 u3 -- dquot ) \ double m-star-slash + \G dquot=(d1*n2)/u3, with the intermediate result being triple-precision. + \G In ANS Forth u3 can only be a positive signed number. >r s>d >r abs -rot s>d r> xor r> swap >r >r dabs rot tuck um* 2swap um* swap >r 0 d+ r> -rot r@ um/mod -rot r> um/mod nip swap @@ -67,70 +73,77 @@ decimal \ C" 17may93jaw -: (c") "lit ; - -: CLiteral - postpone (c") here over char+ allot place align ; immediate restrict - -: C" ( compilation "..." -- ; run-time -- c-addr ) \ core-ext c-quote +: C" ( compilation "ccc" -- ; run-time -- c-addr ) \ core-ext c-quote + \G Compilation: parse a string @i{ccc} delimited by a @code{"} + \G (double quote). At run-time, return @i{c-addr} which + \G specifies the counted string @i{ccc}. Interpretation + \G semantics are undefined. [char] " parse postpone CLiteral ; immediate restrict -\ UNUSED 17may93jaw - -: unused ( -- u ) \ core-ext - forthstart dup 3 cells + @ + here - ; - \ [COMPILE] 17may93jaw : [compile] ( compilation "name" -- ; run-time ? -- ? ) \ core-ext bracket-compile - ' compile, ; immediate - -\ MARKER 17may93jaw - -\ : marker here last @ create , , DOES> dup @ last ! cell+ @ dp ! ; -\ doesn't work now. vocabularies? + comp' drop + dup [ comp' exit drop ] literal = if + execute \ EXIT has default compilation semantics, perform them + else + compile, + then ; immediate \ CONVERT 17may93jaw : convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext - \ obsolescent; superseded by @code{>number}. - true >number drop ; + \G OBSOLESCENT: superseded by @code{>number}. + char+ true >number drop ; \ ERASE 17may93jaw -: erase ( addr len -- ) \ core-ext +: erase ( addr u -- ) \ core-ext + \G Clear all bits in @i{u} aus starting at @i{addr}. \ !! dependence on "1 chars 1 =" ( 0 1 chars um/mod nip ) 0 fill ; -: blank ( addr len -- ) \ string +: blank ( c-addr u -- ) \ string + \G Store the space character into @i{u} chars starting at @i{c-addr}. bl fill ; \ SEARCH 02sep94py -: search ( buf buflen text textlen -- restbuf restlen flag ) \ string - 2over 2 pick - 1+ 3 pick c@ >r - BEGIN - r@ scan dup - WHILE - >r >r 2dup r@ -text - 0= - IF - >r drop 2drop r> r> r> rot + 1- rdrop true - EXIT - THEN - r> r> 1 /string - REPEAT - 2drop 2drop rdrop false ; +: search ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 flag ) \ string + \G Search the string specified by @i{c-addr1, u1} for the string + \G specified by @i{c-addr2, u2}. If @i{flag} is true: match was found + \G at @i{c-addr3} with @i{u3} characters remaining. If @i{flag} is false: + \G no match was found; @i{c-addr3, u3} are equal to @i{c-addr1, u1}. + \ not very efficient; but if we want efficiency, we'll do it as primitive + 2>r 2dup + begin + dup r@ >= + while + over 2r@ swap -text 0= if + 2swap 2drop 2r> 2drop true exit + endif + 1 /string + repeat + 2drop 2r> 2drop false ; \ SOURCE-ID SAVE-INPUT RESTORE-INPUT 11jun93jaw -: source-id ( -- 0 | -1 | fileid ) \ core-ext source-i-d - loadfile @ dup 0= IF drop sourceline# 0 min THEN ; - -: save-input ( -- x1 .. xn n ) \ core-ext +[IFUNDEF] source-id +: source-id ( -- 0 | -1 | fileid ) \ core-ext,file source-i-d + \G Return 0 (the input source is the user input device), -1 (the + \G input source is a string being processed by @code{evaluate}) or + \G a @i{fileid} (the input source is the file specified by + \G @i{fileid}). + loadfile @ dup 0= IF drop sourceline# 0 min THEN ; + +: save-input ( -- xn .. x1 n ) \ core-ext + \G The @i{n} entries @i{xn - x1} describe the current state of the + \G input source specification, in some platform-dependent way that can + \G be used by @code{restore-input}. >in @ loadfile @ if loadfile @ file-position throw + [IFDEF] #fill-bytes #fill-bytes @ [ELSE] #tib @ 1+ [THEN] 0 d- else blk @ linestart @ @@ -140,7 +153,11 @@ decimal source-id 6 ; -: restore-input ( x1 .. xn n -- flag ) \ core-ext +: restore-input ( xn .. x1 n -- flag ) \ core-ext + \G Attempt to restore the input source specification to the state + \G described by the @i{n} entries @i{xn - x1}. @i{flag} is + \G true if the restore fails. In Gforth it fails pretty often + \G (and sometimes with a @code{throw}). 6 <> -12 and throw source-id <> -12 and throw >tib ! @@ -148,6 +165,7 @@ decimal loadfile @ 0<> if loadfile @ reposition-file throw + refill 0= -36 and throw \ should never throw else linestart ! blk ! @@ -159,36 +177,23 @@ decimal r> loadline ! >in ! false ; - -\ : save-input ( -- x1 .. xn n ) \ core-ext -\ >in @ -\ loadfile @ ?dup -\ IF dup file-position throw sourceline# >tib @ 6 -\ #tib @ >tib +! -\ ELSE sourceline# blk @ linestart @ >tib @ 5 THEN -\ ; - -\ : restore-input ( x1 .. xn n -- flag ) \ core-ext -\ swap >tib ! -\ 6 = IF loadline ! rot dup loadfile ! -\ reposition-file IF drop true EXIT THEN -\ ELSE linestart ! blk ! -\ dup sourceline# <> IF 2drop true EXIT THEN -\ loadline ! -\ THEN -\ >in ! false ; - - - +[THEN] \ This things we don't need, but for being complete... jaw \ EXPECT SPAN 17may93jaw -variable span ( -- a-addr ) \ core-ext -\ obsolescent - -: expect ( c-addr +len -- ) \ core-ext - \ obsolescent; use accept +variable span ( -- c-addr ) \ core-ext +\G @code{Variable} -- @i{c-addr} is the address of a cell that stores the +\G length of the last string received by @code{expect}. OBSOLESCENT. + +: expect ( c-addr +n -- ) \ core-ext + \G Receive a string of at most @i{+n} characters, and store it + \G in memory starting at @i{c-addr}. The string is + \G displayed. Input terminates when the key is pressed or + \G @i{+n} characters have been received. The normal Gforth line + \G editing capabilites are available. The length of the string is + \G stored in @code{span}; it does not include the + \G character. OBSOLESCENT: superceeded by @code{accept}. 0 rot over BEGIN ( maxlen span c-addr pos1 ) key decode ( maxlen span c-addr pos2 flag ) @@ -197,3 +202,89 @@ variable span ( -- a-addr ) \ core-ext 2 pick swap /string type nip span ! ; +\ marker 18dec94py + +\ Marker creates a mark that is removed (including everything +\ defined afterwards) when executing the mark. + +: included-files-mark ( -- u ) + included-files 2@ nip + blk @ 0= + if \ not input from blocks + source-id 1 -1 within + if \ input from file + 1- \ do not include the last file (hopefully this is the + \ currently included file) + then + then ; + +\ hmm, most of the saving appears to be pretty unnecessary: we could +\ derive the wordlists and the words that have to be kept from the +\ saved value of dp value. - anton + +: marker, ( -- mark ) + here + included-files-mark , + dup A, \ here + voclink @ A, \ vocabulary list start + \ for all wordlists, remember wordlist-id (the linked list) + voclink + BEGIN + @ dup + WHILE + dup 0 wordlist-link - wordlist-id @ A, + REPEAT + drop + \ remember udp + udp @ , + \ remember dyncode-ptr + here ['] noop , compile-prim1 finish-code ; + +: marker! ( mark -- ) + \ reset included files count; resize will happen on next add-included-file + included-files 2@ drop over @ included-files 2! cell+ + \ rest of marker! + dup @ swap cell+ ( here rest-of-marker ) + dup @ voclink ! cell+ + \ restore wordlists to former words + voclink + BEGIN + @ dup + WHILE + over @ over 0 wordlist-link - wordlist-id ! + swap cell+ swap + REPEAT + drop + \ rehash wordlists to remove forgotten words + \ why don't we do this in a single step? - anton + voclink + BEGIN + @ dup + WHILE + dup 0 wordlist-link - rehash + REPEAT + drop + \ restore udp and dp +[IFDEF] forget-dyncode + dup cell+ @ forget-dyncode 0= abort" gforth bug" +[THEN] + @ udp ! dp ! + \ clean up vocabulary stack + 0 vp @ 0 + ?DO + vp cell+ I cells + @ dup here > + IF drop ELSE swap 1+ THEN + LOOP + dup 0= or set-order \ -1 set-order if order is empty + get-current here > IF + forth-wordlist set-current + THEN ; + +: marker ( " name" -- ) \ core-ext + \G Create a definition, @i{name} (called a @i{mark}) whose + \G execution semantics are to remove itself and everything + \G defined after it. + marker, Create A, +DOES> ( -- ) + @ marker! ; +