--- gforth/search.fs 2000/08/23 21:03:52 1.16 +++ gforth/search.fs 2007/12/31 17:34:58 1.31 @@ -1,6 +1,6 @@ \ search order wordset 14may93py -\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2007 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -16,12 +16,15 @@ \ 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. -$10 constant maxvp -Variable vp - 0 A, 0 A, 0 A, 0 A, 0 A, 0 A, 0 A, 0 A, - 0 A, 0 A, 0 A, 0 A, 0 A, 0 A, 0 A, 0 A, +require struct.fs + +$10 Value maxvp \ current size of search order stack +$400 Value maxvp-limit \ upper limit for resizing search order stack +0 AValue vp \ will be initialized later (dynamic) +\ the first cell at vp contains the search order depth, the others +\ contain the wordlists, starting with the last-searched one. : get-current ( -- wid ) \ search \G @i{wid} is the identifier of the current compilation word list. @@ -50,7 +53,7 @@ Variable slowvoc 0 slowvoc ! : mappedwordlist ( map-struct -- wid ) \ gforth \G Create a wordlist with a special map-structure. - here swap A, 0 A, voclink @ A, 0 A, + align here swap A, 0 A, voclink @ A, 0 A, dup wordlist-link voclink ! dup initvoc ; @@ -71,7 +74,11 @@ Variable slowvoc 0 slowvoc ! Create wordlist drop DOES> context ! ; : check-maxvp ( n -- ) - maxvp > -49 and throw ; + dup maxvp-limit > -49 and throw + dup maxvp > IF + BEGIN dup maxvp 2* dup TO maxvp <= UNTIL + vp maxvp 1+ cells resize throw TO vp + THEN drop ; : >order ( wid -- ) \ gforth to-order \g Push @var{wid} on the search order. @@ -91,13 +98,10 @@ Variable slowvoc 0 slowvoc ! : (vocfind) ( addr count wid -- nfa|false ) \ !! generalize this to be independent of vp - drop vp dup @ 1- cells over + - DO 2dup I 2@ over <> - IF (search-wordlist) dup - IF nip nip UNLOOP EXIT - THEN drop - ELSE drop 2drop THEN - [ -1 cells ] Literal +LOOP + drop 0 vp @ -DO ( addr count ) \ note that the loop does not reach 0 + 2dup vp i cells + @ (search-wordlist) dup if ( addr count nt ) + nip nip unloop exit then + drop 1 -loop 2drop false ; 0 value locals-wordlist @@ -131,7 +135,7 @@ slowvoc off \ Only root 14may93py -Vocabulary Forth ( -- ) \ gforthman- search-ext +Vocabulary Forth ( -- ) \ search-ext \G Replace the @i{wid} at the top of the search order with the \G @i{wid} associated with the word list @code{forth-wordlist}. @@ -146,12 +150,30 @@ Vocabulary Root ( -- ) \ gforth \G order (for Gforth, this is the word list @code{Root}). 1 vp! Root also ; +: update-image-order ( -- ) + \ save search order here, let vp point there + here vp over vp @ 1+ cells + dup allot move + to vp ; + +: init-vp ( -- ) + vp @ $10 max to maxvp + maxvp 1+ cells allocate throw + vp over vp @ 1+ cells move + TO vp ; + +:noname + init-vp DEFERS 'cold ; +IS 'cold + +here 0 , to vp + +init-vp Only Forth also definitions + \ set initial search order 14may93py Forth-wordlist wordlist-id @ ' Forth >body wordlist-id ! -0 vp! also Root also definitions -Only Forth also definitions lookup ! \ our dictionary search order becomes the law ( -- ) ' Forth >body to Forth-wordlist \ "forth definitions get-current" and "forth-wordlist" should produce the same wid @@ -167,7 +189,7 @@ lookup ! \ our dictionary search order b \G last. vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ; -: set-order ( widn .. wid1 n -- ) \ gforthman- search +: set-order ( widn .. wid1 n -- ) \ search \G If @var{n}=0, empty the search order. If @var{n}=-1, set the \G search order to the implementation-defined minimum search order \G (for Gforth, this is the word list @code{Root}). Otherwise, @@ -180,17 +202,41 @@ lookup ! \ our dictionary search order b THEN dup check-maxvp dup vp! - ?dup IF 1- FOR vp cell+ I cells + ! NEXT THEN ; + 0 swap -DO ( wid1 ... widi ) + vp i cells + ! \ note that the loop does not reach 0 + 1 -loop ; : seal ( -- ) \ gforth \G Remove all word lists from the search order stack other than the word \G list that is currently on the top of the search order stack. context @ 1 set-order ; -: .voc - body> >head-noprim name>string type space ; +[IFUNDEF] .name +: id. ( nt -- ) \ gforth i-d-dot + \G Print the name of the word represented by @var{nt}. + \ this name comes from fig-Forth + name>string type space ; + +' id. alias .id ( nt -- ) \ F83 dot-i-d +\G F83 name for @code{id.}. + +' id. alias .name ( nt -- ) \ gforth-obsolete dot-name +\G Gforth <=0.5.0 name for @code{id.}. + +[THEN] + +: .voc ( wid -- ) \ gforth dot-voc +\G print the name of the wordlist represented by @var{wid}. Can +\G only print names defined with @code{vocabulary} or +\G @code{wordlist constant}, otherwise prints @samp{???}. + dup >r wordlist-struct %size + dup head? if ( wid nt ) + dup name>int dup >code-address docon: = swap >body @ r@ = and if + id. rdrop exit + endif + endif + drop r> body> >head-noprim id. ; -: order ( -- ) \ gforthman- search-ext +: order ( -- ) \ search-ext \G Print the search order and the compilation word list. The \G word lists are printed in the order in which they are searched \G (which is reversed with respect to the conventional way of @@ -219,13 +265,13 @@ Root definitions ' words Alias words ( -- ) \ tools \G Display a list of all of the definitions in the word list at the top \G of the search order. -' Forth Alias Forth +' Forth Alias Forth \ alias- search-ext ' forth-wordlist alias forth-wordlist ( -- wid ) \ search \G @code{Constant} -- @i{wid} identifies the word list that includes all of the standard words \G provided by Gforth. When Gforth is invoked, this word list is the compilation word \G list and is at the top of the search order. -' set-order alias set-order -' order alias order +' set-order alias set-order ( wid1 ... widu u -- ) \ alias- search +' order alias order ( -- ) \ alias- search-ext Forth definitions