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

version 1.18, 1997/07/06 15:55:24 version 1.40, 2009/12/31 15:32:35
Line 1 Line 1
 \ Hashed dictionaries                                  15jul94py  \ Hashed dictionaries                                  15jul94py
   
 \ Copyright (C) 1995 Free Software Foundation, Inc.  \ Copyright (C) 1995,1998,2000,2003,2006,2007,2009 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ modify it under the terms of the GNU General Public License
 \ as published by the Free Software Foundation; either version 2  \ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ 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, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
   
 [IFUNDEF] e? : e? name 2drop false ; [THEN]  [IFUNDEF] erase
   : erase ( addr len -- ) 0 fill ;
   [THEN]
   
 e? ec  [IFUNDEF] allocate
 [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
   
 \ compute hash key                                     15jul94py  \ compute hash key                                     15jul94py
   
   has? ec [IF] [IFUNDEF] hash
   : hash ( addr len -- key )
     over c@ swap 1- IF swap char+ c@ + ELSE nip THEN
     [ Hashlen 1- ] literal and ;
   [THEN] [THEN]
   
 [IFUNDEF] hash  [IFUNDEF] hash
 : hash ( addr len -- key )  : hash ( addr len -- key )
     hashbits (hashkey1) ;      hashbits (hashkey1) ;
Line 46  Variable revealed Line 51  Variable revealed
   
 \ Memory handling                                      10oct94py  \ Memory handling                                      10oct94py
   
 Variable HashPointer  AVariable HashPointer
 Variable HashIndex  Variable HashIndex     \ Number of wordlists
 0 Value HashTable  Variable HashPop       \ Number of words
   0 AValue HashTable
   
 \ forward declarations  \ forward declarations
 0 Value hashsearch-map  0 AValue 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 69  Defer hash-alloc Line 75  Defer hash-alloc
     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 @ (hashlfind) ;
   
 \ hash vocabularies                                    16jul94py  \ hash vocabularies                                    16jul94py
   
Line 85  Defer hash-alloc Line 91  Defer hash-alloc
     ELSE      ELSE
         lastlink!          lastlink!
     THEN      THEN
     revealed on ;      revealed on 1 HashPop +! 0 hash-alloc drop ;
   
 : hash-reveal ( nfa wid -- )  : hash-reveal ( nfa wid -- )
     2dup (reveal) (reveal ;      2dup (reveal) (reveal ;
   
 : inithash ( wid -- )  : inithash ( wid -- )
     wordlist-extend      wordlist-extend
     insRule @ >r  insRule off  hash-alloc 3 cells - dup      insRule @ >r  insRule off  1 hash-alloc over ! 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 ! ;
   
 : addall  ( -- )  : addall  ( -- )
     voclink      HashPop off 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 115  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 128  Defer hash-alloc Line 144  Defer hash-alloc
   IF   inithash    IF   inithash
   ELSE rehashall THEN ;    ELSE rehashall THEN ;
   
 \ >rom ?!  : hashdouble ( -- )
 align here    ' hash-find A, ' hash-reveal A, ' (rehash) A, ' (rehash) A,      HashTable >r clearhash
 to hashsearch-map      1 hashbits 1+ dup  to hashbits  lshift  to hashlen
       r> free >r  0 to HashTable
       addall r> throw ;
   
   const Create (hashsearch-map)
   ' hash-find A, ' hash-reveal A, ' (rehash) A, ' (rehash) A,
   (hashsearch-map) to hashsearch-map
   
 \ hash allocate and vocabulary initialization          10oct94py  \ hash allocate and vocabulary initialization          10oct94py
   
 :noname ( hash-alloc ) ( addr -- addr )    :noname ( n+ -- n )
   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 @ swap 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    HashPop @ hashlen 2* >= or
       1 hashbits 1+ dup  to hashbits  lshift  to hashlen    IF  hashdouble  THEN 
       r> free >r  0 to HashTable  
       addall r> throw  
   THEN   
   [ [THEN] ] ; is hash-alloc    [ [THEN] ] ; is hash-alloc
   
 \ Hash-Find                                            01jan93py  \ Hash-Find                                            01jan93py
 e? cross 0=   has? cross 0= 
 [IF]  [IF]
   : hash-wordlist ( wid -- )
     hashsearch-map swap wordlist-map ! ;
 : make-hash  : make-hash
   hashsearch-map forth-wordlist cell+ !    forth-wordlist hash-wordlist
     environment-wordlist hash-wordlist
     ['] Root >body hash-wordlist
   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  :noname ( -- )
       defers 'cold
       hash-cold
   ; is 'cold
   
 : .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+ @ 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
Line 203  e? cross 0= Line 229  e? cross 0=
 \ : chisq ( -- n )  \ : chisq ( -- n )
 \     \ n should have about the same size as Hashlen  \     \ n should have about the same size as Hashlen
 \     countwl Hashlen 2 pick */ swap - ;  \     countwl Hashlen 2 pick */ swap - ;
   
   \ Create hashhist here $100 cells dup allot erase
   
   \ : .hashhist ( -- )  hashhist $100 cells erase
   \     HashTable HashLen cells bounds
   \     DO  0 I  BEGIN  @ dup  WHILE  swap 1+ swap  REPEAT  drop
   \         1 swap cells hashhist + +!
   \     cell +LOOP
   \     0 0 $100 0 DO
   \         hashhist I cells + @ dup IF
   \       cr I 0 .r ." : " dup .  THEN tuck I * + >r + r>
   \     LOOP cr ." Total: " 0 .r ." /" . cr ;

Removed from v.1.18  
changed lines
  Added in v.1.40


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