Diff for /gforth/hash.fs between versions 1.12 and 1.13

version 1.12, 1996/05/06 12:39:00 version 1.13, 1996/05/09 18:12:59
Line 27  Variable revealed Line 27  Variable revealed
 \ Memory handling                                      10oct94py  \ Memory handling                                      10oct94py
   
 Variable HashPointer  Variable HashPointer
 Variable HashTable  
 Variable HashIndex  Variable HashIndex
   0 Value HashTable
   
 \ DelFix and NewFix are from bigFORTH                  15jul94py  \ DelFix and NewFix are from bigFORTH                  15jul94py
   
Line 49  Variable HashIndex Line 49  Variable HashIndex
     \ @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}
     wordlist-extend @ -rot hash xor ( bucket# )      wordlist-extend @ -rot hash xor ( bucket# )
     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 @ (hashfind) ;
Line 85  Variable HashIndex Line 85  Variable HashIndex
     BEGIN  @ dup @  WHILE  dup 'initvoc  REPEAT  drop ;      BEGIN  @ dup @  WHILE  dup 'initvoc  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
Line 101  Create hashsearch-map ( -- wordlist-map Line 101  Create hashsearch-map ( -- wordlist-map
   
 \ hash allocate and vocabulary initialization          10oct94py  \ hash allocate and vocabulary initialization          10oct94py
   
 : hash-alloc ( addr -- addr )  HashTable @ 0= IF  : hash-alloc ( addr -- addr )  HashTable 0= IF
   Hashlen cells allocate throw HashTable !    Hashlen cells allocate throw TO HashTable
   HashTable @ Hashlen cells erase THEN    HashTable Hashlen cells erase THEN
   HashIndex @ over !  1 HashIndex +!    HashIndex @ over !  1 HashIndex +!
   HashIndex @ Hashlen >=    HashIndex @ Hashlen >=
   IF  clearhash    IF  clearhash
       1 hashbits 1+ dup  to hashbits  lshift  to hashlen        1 hashbits 1+ dup  to hashbits  lshift  to hashlen
       HashTable @ free        HashTable free
       addall        addall
   THEN ;    THEN ;
   
Line 119  Create hashsearch-map ( -- wordlist-map Line 119  Create hashsearch-map ( -- wordlist-map
     BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT      BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT
     2drop  r> insRule ! ;      2drop  r> insRule ! ;
   
 ' (initvoc) IS 'initvoc  ' (initvoc) ' 'initvoc >body !
   
 \ Hash-Find                                            01jan93py  \ Hash-Find                                            01jan93py
   
Line 127  addall          \ Baum aufbauen Line 127  addall          \ Baum aufbauen
 \ Baumsuche ist installiert.  \ Baumsuche ist installiert.
   
 : hash-cold  ( -- ) Defers 'cold  : hash-cold  ( -- ) Defers 'cold
   HashPointer off  HashTable off  HashIndex off    HashPointer off  0 TO HashTable  HashIndex off
   voclink    voclink
   BEGIN  @ dup @  WHILE    BEGIN  @ dup @  WHILE
          dup cell - @ >r           dup cell - @ >r
          dup 'initvoc           dup 'initvoc
          r> over cell - !           r> over cell - !
   REPEAT  drop ;    REPEAT  drop ;
 ' hash-cold IS 'cold  ' hash-cold ' 'cold >body !
   
 : .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  REPEAT  drop
Line 150  addall          \ Baum aufbauen Line 150  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.12  
changed lines
  Added in v.1.13


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