Diff for /gforth/hash.fs between versions 1.5 and 1.23

version 1.5, 1994/11/15 15:55:36 version 1.23, 1998/12/19 13:43:17
Line 1 Line 1
 \ Hashed dictionaries                                  15jul94py  \ Hashed dictionaries                                  15jul94py
   
 9 value hashbits  \ Copyright (C) 1995,1998 Free Software Foundation, Inc.
   
   \ This file is part of Gforth.
   
   \ Gforth is free software; you can redistribute it and/or
   \ modify it under the terms of the GNU General Public License
   \ as published by the Free Software Foundation; either version 2
   \ of the License, or (at your option) any later version.
   
   \ This program is distributed in the hope that it will be useful,
   \ but WITHOUT ANY WARRANTY; without even the implied warranty of
   \ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   \ GNU General Public License for more details.
   
   \ 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.
   
   [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
   
 \ Memory handling                                      10oct94py  \ Memory handling                                      10oct94py
   
 Variable HashPointer  Variable HashPointer
 Variable HashTable  
 Variable HashIndex  Variable HashIndex
   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  : bucket ( addr len wordlist -- bucket-addr )
       \ @var{bucket-addr} is the address of a cell that points to the first
 : hash ( addr len -- key )      \ element in the list of the bucket for the string @var{addr len}
     hashbits (hashkey1) ;      wordlist-extend @ -rot hash xor ( bucket# )
 \   (hashkey)      cells HashTable + ;
 \   Hashlen 1- and ;  
   
   
 : hash-find ( addr len wordlist -- nfa / false )  : hash-find ( addr len wordlist -- nfa / false )
     $C + @ >r      >r 2dup r> bucket @ (hashfind) ;
     2dup hash r> xor cells HashTable @ + @ (hashfind) ;  
   
 \ hash vocabularies                                    16jul94py  \ hash vocabularies                                    16jul94py
   
 : lastlink! ( addr link -- )  : lastlink! ( addr link -- )
   BEGIN  dup @ dup  WHILE  nip  REPEAT  drop ! ;    BEGIN  dup @ dup  WHILE  nip  REPEAT  drop ! ;
   
 : (reveal ( addr voc -- )  $C + dup @ 0< IF  2drop EXIT  THEN  : (reveal ( nfa wid -- )
   @ over cell+ count $1F and Hash xor cells >r      over name>string rot bucket >r
   HashPointer 8 $400 NewFix      HashPointer 2 Cells $400 NewFix
   tuck cell+ ! r> HashTable @ + insRule @      tuck cell+ ! r> insRule @
   IF  dup @ 2 pick ! !  ELSE  lastlink!  THEN  revealed on ;      IF
           dup @ 2 pick ! !
 : hash-reveal ( -- )  (reveal) last?  IF      ELSE
   current @ (reveal  THEN ;          lastlink!
       THEN
       revealed on ;
   
   : hash-reveal ( nfa wid -- )
       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 @ hashsearch-map = 
              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
 : rehash  clearhash addall ;      HashIndex off 
 : (rehash) ( addr -- )      voclink
   drop revealed @ IF  rehash 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  ' hash-find A, ' hash-reveal A, ' (rehash) A,  : (rehash)   ( wid -- )
     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 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 over cell+ ! dup  
     BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT  
     2drop  r> insRule ! ;  
   
 ' (initvoc) IS 'initvoc  
   
 \ Hash-Find                                            01jan93py  \ Hash-Find                                            01jan93py
   has? cross 0= 
 addall          \ Baum aufbauen  [IF]
 \ Baumsuche ist installiert.  : make-hash
     hashsearch-map forth-wordlist wordlist-map !
 : hash-cold  ( -- ) Defers 'cold  
   HashPointer off  HashTable off  HashIndex off  
   addall ;    addall ;
 ' hash-cold IS 'cold    make-hash \ Baumsuche ist installiert.
   [ELSE]
     hashsearch-map forth-wordlist wordlist-map !
   [THEN]
   
   \ for ec version display that vocabulary goes hashed
   
   : hash-cold  ( -- )
   [ has? ec [IF] ] ." Hashing..." [ [THEN] ]
     HashPointer off  0 TO HashTable  HashIndex off
     addall
   \  voclink
   \  BEGIN  @ dup WHILE
   \         dup 0 wordlist-link - initvoc
   \  REPEAT  drop 
   [ has? ec [IF] ] ." Done" cr [ [THEN] ] ;
   
   ' 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
Line 110  addall          \ Baum aufbauen Line 195  addall          \ Baum aufbauen
 \     \ gives the number of words in the current wordlist  \     \ gives the number of words in the current wordlist
 \     \ and the sum of squares for the sublist lengths  \     \ and the sum of squares for the sublist lengths
 \     0 0  \     0 0
 \     hashtable @ Hashlen cells bounds DO  \     hashtable Hashlen cells bounds DO
 \        0 i BEGIN  \        0 i BEGIN
 \            @ dup WHILE  \            @ dup WHILE
 \            swap 1+ swap  \            swap 1+ swap

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


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