--- gforth/extend.fs 1997/03/27 13:31:01 1.23 +++ gforth/extend.fs 1999/03/23 20:24:18 1.33 @@ -1,6 +1,6 @@ \ EXTEND.FS CORE-EXT Word not fully tested! 12may93jaw -\ Copyright (C) 1995 Free Software Foundation, Inc. +\ Copyright (C) 1995,1998 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -25,14 +25,19 @@ decimal \ .( 12may93jaw -: .( ( compilation "..." -- ) \ core-ext dot-paren - [char] ) parse type ; immediate +: .( ( "ccc" -- ) \ core-ext dot-paren + \G Parse a string @var{ccc} delimited by a @code{)} (right + \G parenthesis). Display the string. This is often used to display + \G progress information during compilation; see examples below. + [char] ) parse type ; immediate \ VALUE 2>R 2R> 2R@ 17may93jaw \ !! 2value : 2Literal ( compilation w1 w2 -- ; run-time -- w1 w2 ) \ double two-literal + \G Compile appropriate code such that, at run-time, cell pair @var{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 @@ -70,57 +75,55 @@ decimal : 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 @var{ccc} delimited by a @code{"} + \G (double quote). At run-time, return @var{c-addr} which + \G specifies the counted string @var{ccc}. Interpretation + \G semantics are undefined. [char] " parse postpone CLiteral ; immediate restrict -\ UNUSED 17may93jaw - -: dictionary-end ( -- addr ) - forthstart dup 3 cells + @ + ; - -: unused ( -- u ) \ core-ext - dictionary-end 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 compile, ; 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 + \G If @var{len}>0, clear all bits in each location of a memory region + \G of @var{len} address units starting at address @var{addr}. \ !! dependence on "1 chars 1 =" ( 0 1 chars um/mod nip ) 0 fill ; : blank ( addr len -- ) \ string + \G If @var{len}>0, store the character value for a space in each + \G location of a memory region + \G of @var{len} character units starting at address @var{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 @var{c-addr1, u1} for the string + \G specified by @var{c-addr2, u2}. If @var{flag} is true: match was found + \G at @var{c-addr3} with @var{u3} characters remaining. If @var{flag} is false: + \G no match was found; @var{c-addr3, u3} are equal to @var{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 @@ -178,3 +181,84 @@ 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 @ , ; + +: 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 + @ 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, @var{name} (called a @var{mark}) whose + \G execution semantics are to remove itself and everything + \G defined after it. + marker, Create A, +DOES> ( -- ) + @ marker! ; +