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

version 1.9, 1995/03/13 09:17:28 version 1.15, 1996/07/16 20:57:10
Line 1 Line 1
 \ Hashed dictionaries                                  15jul94py  \ Hashed dictionaries                                  15jul94py
   
   \ 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  11 value hashbits
 1 hashbits lshift Value Hashlen  1 hashbits lshift Value Hashlen
   
Line 9  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 27  Variable HashIndex Line 45  Variable HashIndex
 \   (hashkey)  \   (hashkey)
 \   Hashlen 1- and ;  \   Hashlen 1- and ;
   
   : bucket ( addr len wordlist -- bucket-addr )
       \ @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}
       wordlist-extend @ -rot hash xor ( bucket# )
       cells HashTable + ;
   
 : hash-find ( addr len wordlist -- nfa / false )  : hash-find ( addr len wordlist -- nfa / false )
     [ 3 cells ] Literal + @ >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 -- )  [ 3 cells ] Literal + dup @ 0< IF  2drop EXIT  THEN  : (reveal ( nfa wid -- )
   @ over cell+ count $1F and Hash xor cells >r      dup wordlist-extend @ 0<
   HashPointer 2 Cells $400 NewFix      IF
   tuck cell+ ! r> HashTable @ + insRule @          2drop EXIT
   IF  dup @ 2 pick ! !  ELSE  lastlink!  THEN  revealed on ;      THEN
       over name>string rot bucket >r
       HashPointer 2 Cells $400 NewFix
       tuck cell+ ! r> insRule @
       IF
           dup @ 2 pick ! !
       ELSE
           lastlink!
       THEN
       revealed on ;
   
 : hash-reveal ( -- )  (reveal) last?  IF  : hash-reveal ( nfa wid -- )
   current @ (reveal  THEN ;      2dup (reveal) (reveal ;
   
 : addall  ( -- )  : addall  ( -- )
     voclink      voclink
     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
         REPEAT  I !          REPEAT  I !
     cell +LOOP  HashIndex off ;      cell +LOOP  HashIndex off ;
   
Line 62  Variable HashIndex Line 93  Variable HashIndex
 : (rehash) ( addr -- )  : (rehash) ( addr -- )
   drop revealed @ IF  re-hash revealed off  THEN ;    drop revealed @ IF  re-hash revealed off  THEN ;
   
 Create hashsearch  ' hash-find A, ' hash-reveal A, ' (rehash) A,  Create hashsearch-map ( -- wordlist-map )
       ' hash-find A, ' hash-reveal A, ' (rehash) A,
   
 \ 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 ;
   
 : (initvoc) ( addr -- )  : (initvoc) ( addr -- )
     cell+ dup @ 0< IF  drop EXIT  THEN      cell+ dup @  0< IF  drop EXIT  THEN
     insRule @ >r  insRule off  hash-alloc      insRule @ >r  insRule off  hash-alloc
     3 cells - hashsearch over cell+ ! dup      3 cells - hashsearch-map over cell+ ! dup
     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 92  addall          \ Baum aufbauen Line 124  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 115  addall          \ Baum aufbauen Line 147  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.9  
changed lines
  Added in v.1.15


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