Diff for /gforth/hash.fs between versions 1.15 and 1.27

version 1.15, 1996/07/16 20:57:10 version 1.27, 2001/01/28 16:54:55
Line 1 Line 1
 \ Hashed dictionaries                                  15jul94py  \ Hashed dictionaries                                  15jul94py
   
 \ Copyright (C) 1995 Free Software Foundation, Inc.  \ Copyright (C) 1995,1998,2000 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 16 Line 16
   
 \ 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, 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.
   
 11 value hashbits  [IFUNDEF] allocate
   : reserve-mem here swap allot ;
   \ move to a kernel/memory.fs
   [ELSE]
   : reserve-mem allocate throw ;
   [THEN]
   
   [IFUNDEF] hashbits
   11 Value hashbits
   [THEN]
 1 hashbits lshift Value Hashlen  1 hashbits lshift Value Hashlen
   
   \ compute hash key                                     15jul94py
   
   [IFUNDEF] hash
   : hash ( addr len -- key )
       hashbits (hashkey1) ;
   [THEN]
   
 Variable insRule        insRule on  Variable insRule        insRule on
 Variable revealed  Variable revealed
   
Line 30  Variable HashPointer Line 46  Variable HashPointer
 Variable HashIndex  Variable HashIndex
 0 Value HashTable  0 Value HashTable
   
   \ forward declarations
   0 Value hashsearch-map
   Defer hash-alloc ( addr -- addr )
   
 \ DelFix and NewFix are from bigFORTH                  15jul94py  \ DelFix and NewFix are from bigFORTH                  15jul94py
   
 : DelFix ( addr root -- ) dup @ 2 pick ! ! ;  : DelFix ( addr root -- ) dup @ 2 pick ! ! ;
 : NewFix  ( root len # -- addr )  : NewFix  ( root len # -- addr )
   BEGIN  2 pick @ ?dup  0= WHILE  2dup * allocate throw    BEGIN  2 pick @ ?dup  0= WHILE  2dup * reserve-mem
          over 0 ?DO  dup 4 pick DelFix 2 pick +  LOOP  drop           over 0 ?DO  dup 4 pick DelFix 2 pick +  LOOP  drop
   REPEAT  >r drop r@ @ rot ! r@ swap erase r> ;    REPEAT  >r drop r@ @ rot ! r@ swap erase r> ;
   
 \ compute hash key                                     15jul94py  
   
 : hash ( addr len -- key )  
     hashbits (hashkey1) ;  
 \   (hashkey)  
 \   Hashlen 1- and ;  
   
 : bucket ( addr len wordlist -- bucket-addr )  : bucket ( addr len wordlist -- bucket-addr )
     \ @var{bucket-addr} is the address of a cell that points to the first      \ @var{bucket-addr} is the address of a cell that points to the first
     \ element in the list of the bucket for the string @var{addr len}      \ element in the list of the bucket for the string @var{addr len}
Line 52  Variable HashIndex Line 65  Variable HashIndex
     cells HashTable + ;      cells HashTable + ;
   
 : hash-find ( addr len wordlist -- nfa / false )  : hash-find ( addr len wordlist -- nfa / false )
     >r 2dup r> bucket @ (hashfind) ;      >r 2dup r> bucket @ (hashlfind) ;
   
 \ hash vocabularies                                    16jul94py  \ hash vocabularies                                    16jul94py
   
Line 60  Variable HashIndex Line 73  Variable HashIndex
   BEGIN  dup @ dup  WHILE  nip  REPEAT  drop ! ;    BEGIN  dup @ dup  WHILE  nip  REPEAT  drop ! ;
   
 : (reveal ( nfa wid -- )  : (reveal ( nfa wid -- )
     dup wordlist-extend @ 0<  
     IF  
         2drop EXIT  
     THEN  
     over name>string rot bucket >r      over name>string rot bucket >r
     HashPointer 2 Cells $400 NewFix      HashPointer 2 Cells $400 NewFix
     tuck cell+ ! r> insRule @      tuck cell+ ! r> insRule @
Line 77  Variable HashIndex Line 86  Variable HashIndex
 : hash-reveal ( nfa wid -- )  : hash-reveal ( nfa wid -- )
     2dup (reveal) (reveal ;      2dup (reveal) (reveal ;
   
   : inithash ( wid -- )
       wordlist-extend
       insRule @ >r  insRule off  hash-alloc 3 cells -
       dup wordlist-id
       BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT
       2drop  r> insRule ! ;
   
 : addall  ( -- )  : addall  ( -- )
     voclink      voclink
     BEGIN  @ dup @  WHILE  dup 'initvoc  REPEAT  drop ;      BEGIN  @ dup WHILE
              dup 0 wordlist-link -
              dup wordlist-map @ reveal-method @ ['] hash-reveal = 
              IF  inithash ELSE drop THEN
       REPEAT  drop ;
   
 : clearhash  ( -- )  : clearhash  ( -- )
     HashTable Hashlen cells bounds      HashTable Hashlen cells bounds
     DO  I @      DO  I @
         BEGIN  dup  WHILE          BEGIN  dup  WHILE
                dup @ swap HashPointer DelFix              dup @ swap HashPointer DelFix
         REPEAT  I !          REPEAT
     cell +LOOP  HashIndex off ;          I !
           cell +LOOP
 : re-hash  clearhash addall ;      HashIndex off 
 : (rehash) ( addr -- )      voclink
   drop revealed @ IF  re-hash revealed off  THEN ;      BEGIN ( wordlist-link-addr )
           @ dup
       WHILE ( wordlist-link )
           dup 0 wordlist-link - ( wordlist-link wid ) 
           dup wordlist-map @ hashsearch-map = 
           IF ( wordlist-link wid )
               0 swap wordlist-extend !
           ELSE
               drop
           THEN
       REPEAT
       drop ;
   
   : rehashall  ( wid -- ) 
     drop revealed @ 
     IF    clearhash addall revealed off 
     THEN ;
   
 Create hashsearch-map ( -- wordlist-map )  : (rehash)   ( wid -- )
     ' hash-find A, ' hash-reveal A, ' (rehash) A,    dup wordlist-extend @ 0=
     IF   inithash
     ELSE rehashall THEN ;
   
   \ >rom ?!
   align here    ' hash-find A, ' hash-reveal A, ' (rehash) A, ' (rehash) A,
   to hashsearch-map
   
 \ hash allocate and vocabulary initialization          10oct94py  \ hash allocate and vocabulary initialization          10oct94py
   
 : hash-alloc ( addr -- addr )  HashTable 0= IF  :noname ( addr -- addr )
   Hashlen cells allocate throw TO HashTable    HashTable 0= 
   HashTable Hashlen cells erase THEN    IF  Hashlen cells reserve-mem TO HashTable
         HashTable Hashlen cells erase THEN
   HashIndex @ over !  1 HashIndex +!    HashIndex @ over !  1 HashIndex +!
   HashIndex @ Hashlen >=    HashIndex @ Hashlen >=
   IF  clearhash    [ [IFUNDEF] allocate ]
     ABORT" no more space in hashtable"
     [ [ELSE] ]
     IF  HashTable >r clearhash
       1 hashbits 1+ dup  to hashbits  lshift  to hashlen        1 hashbits 1+ dup  to hashbits  lshift  to hashlen
       HashTable free        r> free >r  0 to HashTable
       addall        addall r> throw
   THEN ;    THEN 
     [ [THEN] ] ; is hash-alloc
 : (initvoc) ( addr -- )  
     cell+ dup @  0< IF  drop EXIT  THEN  
     insRule @ >r  insRule off  hash-alloc  
     3 cells - hashsearch-map over cell+ ! dup  
     BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT  
     2drop  r> insRule ! ;  
   
 ' (initvoc) ' 'initvoc >body !  
   
 \ Hash-Find                                            01jan93py  \ Hash-Find                                            01jan93py
   has? cross 0= 
   [IF]
   : make-hash
     hashsearch-map forth-wordlist wordlist-map !
     addall ;
     make-hash \ Baumsuche ist installiert.
   [ELSE]
     hashsearch-map forth-wordlist wordlist-map !
   [THEN]
   
 addall          \ Baum aufbauen  \ for ec version display that vocabulary goes hashed
 \ Baumsuche ist installiert.  
   
 : hash-cold  ( -- ) Defers 'cold  : hash-cold  ( -- )
   [ has? ec [IF] ] ." Hashing..." [ [THEN] ]
   HashPointer off  0 TO HashTable  HashIndex off    HashPointer off  0 TO HashTable  HashIndex off
   voclink    addall
   BEGIN  @ dup @  WHILE  \  voclink
          dup cell - @ >r  \  BEGIN  @ dup WHILE
          dup 'initvoc  \         dup 0 wordlist-link - initvoc
          r> over cell - !  \  REPEAT  drop 
   REPEAT  drop ;  [ has? ec [IF] ] ." Done" cr [ [THEN] ] ;
 ' hash-cold ' 'cold >body !  
   ' hash-cold INIT8 chained
   
 : .words  ( -- )  : .words  ( -- )
   base @ >r hex HashTable  Hashlen 0    base @ >r hex HashTable  Hashlen 0
   DO  cr  i 2 .r ." : " dup i cells +    DO  cr  i 2 .r ." : " dup i cells +
       BEGIN  @ dup  WHILE        BEGIN  @ dup  WHILE
              dup cell+ @ .name  REPEAT  drop               dup cell+ @ name>string type space  REPEAT  drop
   LOOP  drop r> base ! ;    LOOP  drop r> base ! ;
   
 \ \ this stuff is for evaluating the hash function  \ \ this stuff is for evaluating the hash function

Removed from v.1.15  
changed lines
  Added in v.1.27


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