Diff for /gforth/hash.fs between versions 1.18 and 1.26

version 1.18, 1997/07/06 15:55:24 version 1.26, 2000/09/23 15:46:57
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.
   
 [IFUNDEF] e? : e? name 2drop false ; [THEN]  [IFUNDEF] allocate
   
 e? ec  
 [IF]  
 : reserve-mem here swap allot ;  : reserve-mem here swap allot ;
 \ ToDo: check memory space with unused  
 \ move to a kernel/memory.fs  \ move to a kernel/memory.fs
 [ELSE]  [ELSE]
 : reserve-mem allocate throw ;  : reserve-mem allocate throw ;
 [THEN]  [THEN]
   
 [IFUNDEF] hashbits  [IFUNDEF] hashbits
 11 value hashbits  11 Value hashbits
 [THEN]  [THEN]
 1 hashbits lshift Value Hashlen  1 hashbits lshift Value Hashlen
   
Line 52  Variable HashIndex Line 48  Variable HashIndex
   
 \ forward declarations  \ forward declarations
 0 Value hashsearch-map  0 Value hashsearch-map
 Defer hash-alloc  Defer hash-alloc ( addr -- addr )
   
 \ DelFix and NewFix are from bigFORTH                  15jul94py  \ DelFix and NewFix are from bigFORTH                  15jul94py
   
Line 92  Defer hash-alloc Line 88  Defer hash-alloc
   
 : inithash ( wid -- )  : inithash ( wid -- )
     wordlist-extend      wordlist-extend
     insRule @ >r  insRule off  hash-alloc 3 cells - dup      insRule @ >r  insRule off  hash-alloc 3 cells -
       dup wordlist-id
     BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT      BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT
     2drop  r> insRule ! ;      2drop  r> insRule ! ;
   
Line 100  Defer hash-alloc Line 97  Defer hash-alloc
     voclink      voclink
     BEGIN  @ dup WHILE      BEGIN  @ dup WHILE
            dup 0 wordlist-link -             dup 0 wordlist-link -
            dup wordlist-map @ hashsearch-map =              dup wordlist-map @ reveal-method @ ['] hash-reveal = 
            IF  inithash ELSE drop THEN             IF  inithash ELSE drop THEN
     REPEAT  drop ;      REPEAT  drop ;
   
Line 108  Defer hash-alloc Line 105  Defer hash-alloc
     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
       HashIndex off 
     voclink      voclink
     BEGIN @ dup WHILE      BEGIN ( wordlist-link-addr )
           dup 0 wordlist-link -          @ dup
           dup wordlist-map @ hashsearch-map =       WHILE ( wordlist-link )
           IF 0 swap wordlist-extend ! ELSE drop THEN          dup 0 wordlist-link - ( wordlist-link wid ) 
     REPEAT drop ;          dup wordlist-map @ hashsearch-map = 
           IF ( wordlist-link wid )
               0 swap wordlist-extend !
           ELSE
               drop
           THEN
       REPEAT
       drop ;
   
 : rehashall  ( wid -- )   : rehashall  ( wid -- ) 
   drop revealed @     drop revealed @ 
Line 134  to hashsearch-map Line 140  to hashsearch-map
   
 \ hash allocate and vocabulary initialization          10oct94py  \ hash allocate and vocabulary initialization          10oct94py
   
 :noname ( hash-alloc ) ( addr -- addr )    :noname ( addr -- addr )
   HashTable 0=     HashTable 0= 
   IF  Hashlen cells reserve-mem TO HashTable    IF  Hashlen cells reserve-mem TO HashTable
       HashTable Hashlen cells erase THEN        HashTable Hashlen cells erase THEN
   HashIndex @ over !  1 HashIndex +!    HashIndex @ over !  1 HashIndex +!
   HashIndex @ Hashlen >=    HashIndex @ Hashlen >=
   [ e? ec [IF] ]    [ [IFUNDEF] allocate ]
   ABORT" no more space in hashtable"    ABORT" no more space in hashtable"
   [ [ELSE] ]    [ [ELSE] ]
   IF  HashTable >r clearhash    IF  HashTable >r clearhash
Line 151  to hashsearch-map Line 157  to hashsearch-map
   [ [THEN] ] ; is hash-alloc    [ [THEN] ] ; is hash-alloc
   
 \ Hash-Find                                            01jan93py  \ Hash-Find                                            01jan93py
 e? cross 0=   has? cross 0= 
 [IF]  [IF]
 : make-hash  : make-hash
   hashsearch-map forth-wordlist cell+ !    hashsearch-map forth-wordlist wordlist-map !
   addall ;    addall ;
   make-hash \ Baumsuche ist installiert.    make-hash \ Baumsuche ist installiert.
 [ELSE]  [ELSE]
   hashsearch-map forth-wordlist cell+ !    hashsearch-map forth-wordlist wordlist-map !
 [THEN]  [THEN]
   
 \ for ec version display that vocabulary goes hashed  \ for ec version display that vocabulary goes hashed
   
 : hash-cold  ( -- )  : hash-cold  ( -- )
 [ e? ec [IF] ] ." Hashing..." [ [THEN] ]  [ has? ec [IF] ] ." Hashing..." [ [THEN] ]
   HashPointer off  0 TO HashTable  HashIndex off    HashPointer off  0 TO HashTable  HashIndex off
   addall    addall
 \  voclink  \  voclink
 \  BEGIN  @ dup WHILE  \  BEGIN  @ dup WHILE
 \         dup 0 wordlist-link - initvoc  \         dup 0 wordlist-link - initvoc
 \  REPEAT  drop   \  REPEAT  drop 
 [ e? ec [IF] ] ." Done" cr [ [THEN] ] ;  [ has? ec [IF] ] ." Done" cr [ [THEN] ] ;
   
 ' hash-cold INIT8 chained  ' hash-cold INIT8 chained
   
Line 179  e? cross 0= Line 185  e? cross 0=
   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+ @ head>string type space  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.18  
changed lines
  Added in v.1.26


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