--- gforth/search.fs 1999/03/23 20:24:20 1.8 +++ gforth/search.fs 2000/08/23 21:03:52 1.16 @@ -24,18 +24,22 @@ Variable vp 0 A, 0 A, 0 A, 0 A, 0 A, 0 A, 0 A, 0 A, : get-current ( -- wid ) \ search - \G @var{wid} is the identifier of the current compilation word list. + \G @i{wid} is the identifier of the current compilation word list. current @ ; : set-current ( wid -- ) \ search - \G Set the compilation word list to the word list identified by @var{wid}. + \G Set the compilation word list to the word list identified by @i{wid}. current ! ; -\ : context ( -- addr ) vp dup @ cells + ; -: vp! dup vp ! cells vp + to context ; +:noname ( -- addr ) + vp dup @ cells + ; +is context + +: vp! ( u -- ) + vp ! ; : definitions ( -- ) \ search - \G Make the compilation word list the same as the word list - \G that is currently at the top of the search order stack. + \G Set the compilation word list to be the same as the word list + \G that is currently at the top of the search order. context @ current ! ; \ wordlist Vocabulary also previous 14may93py @@ -51,7 +55,7 @@ Variable slowvoc 0 slowvoc ! dup initvoc ; : wordlist ( -- wid ) \ search - \G Create a new, empty word list represented by @var{wid}. + \G Create a new, empty word list represented by @i{wid}. slowvoc @ IF \ this is now f83search because hashing may be loaded already \ jaw @@ -61,20 +65,27 @@ Variable slowvoc 0 slowvoc ! : Vocabulary ( "name" -- ) \ gforth \G Create a definition "name" and associate a new word list with it. - \G The run-time effect of "name" is to push the new word list's wid - \G onto the top of the search order stack. + \G The run-time effect of "name" is to replace the @i{wid} at the + \G top of the search order with the @i{wid} associated with the new + \G word list. Create wordlist drop DOES> context ! ; -: also ( -- ) \ search ext - \G Perform a @code{DUP} on the search order stack. Usually used prior - \G to @code{Forth}, @code{definitions} etc. - context @ vp @ 1+ dup maxvp > abort" Vocstack full" - vp! context ! ; - -: previous ( -- ) \ search ext - \G Perform a @code{DROP} on the search order stack, thereby removing the wid at the - \G top of the (search order) stack from the search order. - vp @ 1- dup 0= abort" Vocstack empty" vp! ; +: check-maxvp ( n -- ) + maxvp > -49 and throw ; + +: >order ( wid -- ) \ gforth to-order + \g Push @var{wid} on the search order. + vp @ 1+ dup check-maxvp vp! context ! ; + +: also ( -- ) \ search-ext + \G Like @code{DUP} for the search order. Usually used before a + \G vocabulary (e.g., @code{also Forth}); the combined effect is to push + \G the wordlist represented by the vocabulary on the search order. + context @ >order ; + +: previous ( -- ) \ search-ext + \G Drop the wordlist at the top of the search order. + vp @ 1- dup 0= -50 and throw vp! ; \ vocabulary find 14may93py @@ -120,15 +131,17 @@ slowvoc off \ Only root 14may93py -Vocabulary Forth - \G ** this will not get annotated. See other defn below.. ** +Vocabulary Forth ( -- ) \ gforthman- 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}. + + Vocabulary Root ( -- ) \ gforth - \G Add the vocabulary @code{Root} to the search order stack. - \G This vocabulary makes up the minimum search order and - \G contains these words: @code{order} @code{set-order} - \G @code{forth-wordlist} @code{Forth} @code{words} + \G Add the root wordlist to the search order stack. This vocabulary + \G makes up the minimum search order and contains only a + \G search-order words. -: Only ( -- ) \ search ext +: Only ( -- ) \ search-ext \G Set the search order to the implementation-defined minimum search \G order (for Gforth, this is the word list @code{Root}). 1 vp! Root also ; @@ -147,22 +160,27 @@ lookup ! \ our dictionary search order b \ get-order set-order 14may93py : get-order ( -- widn .. wid1 n ) \ search - \G Copy the search order stack to the data stack. The current search - \G order has @var{n} entries, of which @var{wid1} represents the word - \G list that is searched first (the word list at the top of the stack) and - \G @var{widn} represents the word order that is searched last. - vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ; - -: set-order ( widn .. wid1 n -- ) \ search - \G ** this will not get annotated. See other defn below.. ** - \G If n=0, empty the search order. - \G If n=-1, set the search order to the implementation-defined minimum search - \G order (for Gforth, this is the word list Root). Otherwise, replace the - \G existing search order with the n wid entries such that wid1 represents the - \G word list that will be searched first and widn represents the word list that - \G will be searched last. - dup -1 = IF drop Only exit THEN dup vp! - ?dup IF 1- FOR vp cell+ I cells + ! NEXT THEN ; + \G Copy the search order to the data stack. The current search order + \G has @i{n} entries, of which @i{wid1} represents the wordlist + \G that is searched first (the word list at the top of the search + \G order) and @i{widn} represents the wordlist that is searched + \G last. + vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ; + +: set-order ( widn .. wid1 n -- ) \ gforthman- 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, + \G replace the existing search order with the @var{n} wid entries + \G such that @var{wid1} represents the word list that will be + \G searched first and @var{widn} represents the word list that will + \G be searched last. + dup -1 = IF + drop only exit + THEN + dup check-maxvp + dup vp! + ?dup IF 1- FOR vp cell+ I cells + ! NEXT THEN ; : seal ( -- ) \ gforth \G Remove all word lists from the search order stack other than the word @@ -170,17 +188,16 @@ lookup ! \ our dictionary search order b context @ 1 set-order ; : .voc - body> >head name>string type space ; + body> >head-noprim name>string type space ; -: order ( -- ) \ search-ext - \G ** this will not get annotated. See other defn below.. ** - \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 - \G displaying stacks). The compilation word list is displayed last. - \ The standard requires that the word lists are printed in the order - \ in which they are searched. Therefore, the output is reversed - \ with respect to the conventional way of displaying stacks. +: order ( -- ) \ gforthman- 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 + \G displaying stacks). The compilation word list is displayed last. + \ The standard requires that the word lists are printed in the order + \ in which they are searched. Therefore, the output is reversed + \ with respect to the conventional way of displaying stacks. get-order 0 ?DO .voc @@ -199,27 +216,16 @@ lookup ! \ our dictionary search order b 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 ( -- ) \ search-ext - \G Push the @var{wid} associated with @code{forth-wordlist} onto the search order stack. +' 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-wordlist alias forth-wordlist ( -- wid ) \ search - \G CONSTANT: @var{wid} identifies the word list that includes all of the standard words + \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 word list stack. -' set-order alias set-order ( widn .. wid1 n -- ) \ search - \G If @var{n}=0, empty the search order. - \G If @var{n}=-1, set the search order to the implementation-defined minimum search - \G order (for Gforth, this is the word list @code{Root}). Otherwise, replace the - \G existing search order with the @var{n} wid entries such that @var{wid1} represents the - \G word list that will be searched first and @var{widn} represents the word list that - \G will be searched last. -' order alias 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 - \G displaying stacks). The compilation word list is displayed last. + \G list and is at the top of the search order. +' set-order alias set-order +' order alias order Forth definitions