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

version 1.1, 1994/07/21 10:52:43 version 1.15, 1996/07/16 20:57:10
Line 1 Line 1
 \ Hashed dictionaries                                  15jul94py  \ Hashed dictionaries                                  15jul94py
   
 $80 Value Hashlen  \ Copyright (C) 1995 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.
   
   11 value hashbits
   1 hashbits lshift Value Hashlen
   
 Variable insRule        insRule on  Variable insRule        insRule on
   Variable revealed
   
 \ Memory handling                                      15jul94py  \ Memory handling                                      10oct94py
   
 Variable HashPointer  Variable HashPointer
   Variable HashIndex
   0 Value HashTable
   
 : hash-alloc ( addr -- addr )  dup @ 0= IF  \ DelFix and NewFix are from bigFORTH                  15jul94py
   Hashlen cells allocate throw over !  
   dup @ Hashlen cells erase THEN ;  
   
 \ DelFix and NewFix is from bigFORTH                   15jul94py  
   
 : DelFix ( addr root -- ) dup @ 2 pick ! ! ;  : DelFix ( addr root -- ) dup @ 2 pick ! ! ;
 : NewFix  ( root len # -- addr )  : NewFix  ( root len # -- addr )
Line 22  Variable HashPointer Line 40  Variable HashPointer
   
 \ compute hash key                                     15jul94py  \ compute hash key                                     15jul94py
   
 : hash ( addr len -- key )  (hashkey)  : hash ( addr len -- key )
 \  tuck bounds  ?DO  I c@ toupper +  LOOP      hashbits (hashkey1) ;
   Hashlen 1- and ;  \   (hashkey)
   \   Hashlen 1- and ;
 : hash-find ( addr len wordlist -- nfa / false ) $C + @ >r  
   2dup hash cells r> + @ (hashfind) ;  : bucket ( addr len wordlist -- bucket-addr )
 \  BEGIN  dup  WHILE      \ @var{bucket-addr} is the address of a cell that points to the first
 \         2@ >r >r dup r@ cell+ c@ $1F and =      \ element in the list of the bucket for the string @var{addr len}
 \         IF  2dup r@ cell+ char+ capscomp 0=      wordlist-extend @ -rot hash xor ( bucket# )
 \            IF  2drop r> rdrop  EXIT  THEN  THEN      cells HashTable + ;
 \        rdrop r>  
 \  REPEAT nip nip ;  : hash-find ( addr len wordlist -- nfa / false )
       >r 2dup r> bucket @ (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 -- )
   hash-alloc @ over cell+ count $1F and Hash cells + >r      dup wordlist-extend @ 0<
   HashPointer 8 $400 NewFix      IF
   tuck cell+ ! r> insRule @          2drop EXIT
   IF  dup @ 2 pick ! !  ELSE  lastlink!  THEN ;      THEN
       over name>string rot bucket >r
 : hash-reveal ( -- )  (reveal) last?  IF      HashPointer 2 Cells $400 NewFix
   current @ (reveal  THEN ;      tuck cell+ ! r> insRule @
       IF
 Create hashsearch  ' hash-find A,  ' hash-reveal A,  ' drop A,          dup @ 2 pick ! !
       ELSE
 : (initvoc ( addr -- )  cell+ dup @ 0< IF  drop EXIT  THEN          lastlink!
   insRule @ >r  insRule off  hash-alloc      THEN
   3 cells - hashsearch over cell+ ! dup      revealed on ;
   BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT  
   2drop  r> insRule ! ;  : hash-reveal ( nfa wid -- )
       2dup (reveal) (reveal ;
 ' (initvoc IS 'initvoc  
   : addall  ( -- )
       voclink
       BEGIN  @ dup @  WHILE  dup 'initvoc  REPEAT  drop ;
   
   : clearhash  ( -- )
       HashTable Hashlen cells bounds
       DO  I @
           BEGIN  dup  WHILE
                  dup @ swap HashPointer DelFix
           REPEAT  I !
       cell +LOOP  HashIndex off ;
   
   : re-hash  clearhash addall ;
   : (rehash) ( addr -- )
     drop revealed @ IF  re-hash revealed off  THEN ;
   
   Create hashsearch-map ( -- wordlist-map )
       ' hash-find A, ' hash-reveal A, ' (rehash) A,
   
   \ hash allocate and vocabulary initialization          10oct94py
   
   : hash-alloc ( addr -- addr )  HashTable 0= IF
     Hashlen cells allocate throw TO HashTable
     HashTable Hashlen cells erase THEN
     HashIndex @ over !  1 HashIndex +!
     HashIndex @ Hashlen >=
     IF  clearhash
         1 hashbits 1+ dup  to hashbits  lshift  to hashlen
         HashTable free
         addall
     THEN ;
   
   : (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 ! ;
   
 : addall  ( -- )  voclink  ' (initvoc) ' 'initvoc >body !
   BEGIN  @ dup @  WHILE  dup (initvoc  REPEAT  drop ;  
   
 \ Hash-Find                                            01jan93py  \ Hash-Find                                            01jan93py
   
 addall          \ Baum aufbauen  addall          \ Baum aufbauen
 \ Baumsuche ist installiert.  \ Baumsuche ist installiert.
   
   : hash-cold  ( -- ) Defers 'cold
     HashPointer off  0 TO HashTable  HashIndex off
     voclink
     BEGIN  @ dup @  WHILE
            dup cell - @ >r
            dup 'initvoc
            r> over cell - !
     REPEAT  drop ;
   ' hash-cold ' 'cold >body !
   
 : .words  ( -- )  : .words  ( -- )
   base @ >r hex context @ 3 cells +  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  REPEAT  drop
   LOOP  drop r> base ! ;    LOOP  drop r> base ! ;
   
   \ \ this stuff is for evaluating the hash function
   \ : square dup * ;
   
   \ : countwl  ( -- sum sumsq )
   \     \ gives the number of words in the current wordlist
   \     \ and the sum of squares for the sublist lengths
   \     0 0
   \     hashtable Hashlen cells bounds DO
   \        0 i BEGIN
   \            @ dup WHILE
   \            swap 1+ swap
   \        REPEAT
   \        drop
   \        swap over square +
   \        >r + r>
   \        1 cells
   \    +LOOP ;
   
   \ : chisq ( -- n )
   \     \ n should have about the same size as Hashlen
   \     countwl Hashlen 2 pick */ swap - ;

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


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