Diff for /gforth/search.fs between versions 1.23 and 1.34

version 1.23, 2003/02/06 16:49:17 version 1.34, 2011/12/31 15:29:25
Line 1 Line 1
 \ search order wordset                                 14may93py  \ search order wordset                                 14may93py
   
 \ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2007,2011 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ 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.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program. If not, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   require struct.fs
   
 $10 Value maxvp         \ current size of search order stack  $10 Value maxvp         \ current size of search order stack
 $400 Value maxvp-limit  \ upper limit for resizing search order stack  $400 Value maxvp-limit  \ upper limit for resizing search order stack
 0 AValue vp             \ will be initialized later (dynamic)  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  : get-current  ( -- wid ) \ search
   \G @i{wid} is the identifier of the current compilation word list.    \G @i{wid} is the identifier of the current compilation word list.
Line 49  Variable slowvoc   0 slowvoc ! Line 52  Variable slowvoc   0 slowvoc !
   
 : mappedwordlist ( map-struct -- wid )  \ gforth  : mappedwordlist ( map-struct -- wid )  \ gforth
 \G Create a wordlist with a special map-structure.  \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 wordlist-link voclink !
   dup initvoc ;    dup initvoc ;
   
Line 94  Variable slowvoc   0 slowvoc ! Line 97  Variable slowvoc   0 slowvoc !
   
 : (vocfind)  ( addr count wid -- nfa|false )  : (vocfind)  ( addr count wid -- nfa|false )
     \ !! generalize this to be independent of vp      \ !! generalize this to be independent of vp
     drop vp dup @ 1- cells over +      drop 0 vp @ -DO ( addr count ) \ note that the loop does not reach 0
     DO  2dup I 2@ over <>          2dup vp i cells + @ (search-wordlist) dup if ( addr count nt )
         IF  (search-wordlist) dup              nip nip unloop exit then
             IF  nip nip  UNLOOP EXIT      drop 1 -loop
             THEN  drop  
         ELSE  drop 2drop  THEN  
     [ -1 cells ] Literal +LOOP  
     2drop false ;      2drop false ;
   
 0 value locals-wordlist  0 value locals-wordlist
Line 134  slowvoc off Line 134  slowvoc off
   
 \ Only root                                            14may93py  \ 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 Replace the @i{wid} at the top of the search order with the
   \G @i{wid} associated with the word list @code{forth-wordlist}.    \G @i{wid} associated with the word list @code{forth-wordlist}.
   
Line 188  lookup ! \ our dictionary search order b Line 188  lookup ! \ our dictionary search order b
   \G last.    \G last.
   vp @ 0 ?DO vp cell+ I cells + @ LOOP vp @ ;    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 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 search order to the implementation-defined minimum search order
     \G (for Gforth, this is the word list @code{Root}). Otherwise,      \G (for Gforth, this is the word list @code{Root}). Otherwise,
Line 201  lookup ! \ our dictionary search order b Line 201  lookup ! \ our dictionary search order b
     THEN      THEN
     dup check-maxvp      dup check-maxvp
     dup vp!      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  : seal ( -- ) \ gforth
   \G Remove all word lists from the search order stack other than the word    \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.    \G list that is currently on the top of the search order stack.
   context @ 1 set-order ;    context @ 1 set-order ;
   
 : .voc  [IFUNDEF] .name
     body> >head-noprim name>string type space ;  : 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? true = 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 Print the search order and the compilation word list.  The
   \G word lists are printed in the order in which they are searched    \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 (which is reversed with respect to the conventional way of
Line 240  Root definitions Line 264  Root definitions
 ' words Alias words  ( -- ) \ tools  ' words Alias words  ( -- ) \ tools
 \G Display a list of all of the definitions in the word list at the top  \G Display a list of all of the definitions in the word list at the top
 \G of the search order.  \G of the search order.
 ' Forth Alias Forth  ' Forth Alias Forth \ alias- search-ext
 ' forth-wordlist alias forth-wordlist ( -- wid ) \ search  ' forth-wordlist alias forth-wordlist ( -- wid ) \ search
   \G @code{Constant} -- @i{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 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.    \G list and is at the top of the search order.
 ' set-order alias set-order  ' set-order alias set-order ( wid1 ... widu u -- ) \ alias- search
 ' order alias order  ' order alias order ( -- ) \ alias- search-ext
   
 Forth definitions  Forth definitions
   

Removed from v.1.23  
changed lines
  Added in v.1.34


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>