--- gforth/extend.fs 1996/09/10 16:08:36 1.18 +++ gforth/extend.fs 1999/02/03 00:10:20 1.32 @@ -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,16 +25,19 @@ decimal \ .( 12may93jaw -: .( ( compilation "..." -- ) \ core-ext dot-paren - [char] ) parse type ; immediate +: .( ( "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. + [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 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 @@ -72,59 +75,58 @@ 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 ccc delimited by a " (double quote). At + \G run-time, return c-addr which specifies the counted string ccc. + \G Interpretation semantics are undefined. [char] " parse postpone CLiteral ; immediate restrict -\ UNUSED 17may93jaw - -: unused ( -- u ) \ core-ext - s0 @ 512 - \ for stack - 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; supersedet 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 len>0, clear all bits in each location of a memory region + \G of len address units starting at address 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. 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 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. + \ 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 +: 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 @@ -161,26 +163,6 @@ decimal >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 ; - - - \ This things we don't need, but for being complete... jaw \ EXPECT SPAN 17may93jaw @@ -198,3 +180,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! ; +