--- gforth/extend.fs 1999/02/03 00:10:20 1.32 +++ gforth/extend.fs 2010/05/29 16:31:28 1.66 @@ -1,12 +1,12 @@ \ EXTEND.FS CORE-EXT Word not fully tested! 12may93jaw -\ Copyright (C) 1995,1998 Free Software Foundation, Inc. +\ Copyright (C) 1995,1998,2000,2003,2005,2007,2009 Free Software Foundation, Inc. \ This file is part of Gforth. \ Gforth is free software; you can redistribute it and/or \ 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. \ This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ \ GNU General Public License for more details. \ 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. +\ along with this program. If not, see http://www.gnu.org/licenses/. \ May be cross-compiled @@ -25,28 +24,37 @@ decimal \ .( 12may93jaw -: .( ( "ccc" -- ) \ core-ext dot-paren - \G Parse a string ccc delimited by a ) (right parenthesis). Display - \G the string. This is often used to display progress information - \G during compilation. See examples below. +: .( ( 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 \ !! 2value +[ifundef] 2literal : 2Literal ( compilation w1 w2 -- ; run-time -- w1 w2 ) \ double two-literal - \G Compile appropriate code such that, at run-time, cell pair w1, w2 are + \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 +[then] ' 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 - r> IF dnegate THEN ; + swap >r 0 d+ r> -rot r@ um/mod -rot r> um/mod + [ 1 -3 mod 0< ] [if] + -rot r> IF IF 1. d+ THEN dnegate ELSE drop THEN + [else] + nip swap r> IF dnegate THEN + [then] ; \ CASE OF ENDOF ENDCASE 17may93jaw @@ -70,54 +78,52 @@ decimal \ C" 17may93jaw -: (c") "lit ; - -: CLiteral - postpone (c") here over char+ allot place align ; immediate restrict - : C" ( compilation "ccc" -- ; run-time -- c-addr ) \ core-ext c-quote - \G Compilation: parse a string ccc delimited by a " (double quote). At - \G run-time, return c-addr which specifies the counted string ccc. - \G Interpretation semantics are undefined. + \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 \ [COMPILE] 17may93jaw : [compile] ( compilation "name" -- ; run-time ? -- ? ) \ core-ext bracket-compile - comp' drop compile, ; immediate + 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 - \G obsolescent; superseded by @code{>number}. +: convert ( ud1 c-addr1 -- ud2 c-addr2 ) \ core-ext-obsolescent + \G Obsolescent: superseded by @code{>number}. char+ true >number drop ; \ ERASE 17may93jaw -: erase ( addr len -- ) \ core-ext - \G If len>0, clear all bits in each location of a memory region - \G of len address units starting at address addr. +: 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 - \G If len>0, store the character value for a space in each - \G location of a memory region - \G of len character units starting at address addr. +: blank ( c-addr u -- ) \ string + \G Store the space character into @i{u} chars starting at @i{c-addr}. bl fill ; \ SEARCH 02sep94py : search ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 flag ) \ string - \G Search the string specified by c-addr1, u1 for the string - \G speficied by c-addr2, u2. If flag is true: match was found - \G at c-addr3 with u3 characters remaining. If flag is false: - \G no match was found; c-addr3, u3 are equal to c-addr1, u1. + \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 + 2dup 2r@ string-prefix? if 2swap 2drop 2r> 2drop true exit endif 1 /string @@ -126,14 +132,23 @@ decimal \ SOURCE-ID SAVE-INPUT RESTORE-INPUT 11jun93jaw +[IFUNDEF] source-id : source-id ( -- 0 | -1 | fileid ) \ core-ext,file source-i-d - loadfile @ dup 0= IF drop sourceline# 0 min THEN ; - -: save-input ( -- x1 .. xn n ) \ core-ext + \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 @ @@ -143,7 +158,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 ! @@ -151,6 +170,7 @@ decimal loadfile @ 0<> if loadfile @ reposition-file throw + refill 0= -36 and throw \ should never throw else linestart ! blk ! @@ -162,19 +182,27 @@ decimal r> loadline ! >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-obsolescent +\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-obsolescent + \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}. + everyline 0 rot over BEGIN ( maxlen span c-addr pos1 ) - key decode ( maxlen span c-addr pos2 flag ) + xkey decode ( maxlen span c-addr pos2 flag ) >r 2over = r> or UNTIL 2 pick swap /string type @@ -186,15 +214,7 @@ variable span ( -- a-addr ) \ core-ext \ 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 ; + included-files @ ; \ 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 @@ -214,11 +234,13 @@ variable span ( -- a-addr ) \ core-ext REPEAT drop \ remember udp - 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+ + included-files @ over @ min included-files ! cell+ \ rest of marker! dup @ swap cell+ ( here rest-of-marker ) dup @ voclink ! cell+ @@ -241,6 +263,9 @@ variable span ( -- a-addr ) \ core-ext REPEAT drop \ restore udp and dp +[IFDEF] forget-dyncode + dup cell+ @ forget-dyncode drop +[THEN] @ udp ! dp ! \ clean up vocabulary stack 0 vp @ 0 @@ -254,7 +279,7 @@ variable span ( -- a-addr ) \ core-ext THEN ; : marker ( " name" -- ) \ core-ext - \G Create a definition, @var{name} (called a @var{mark}) whose + \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,