[gforth] / gforth / hash.fs  

gforth: gforth/hash.fs

Diff for /gforth/hash.fs between version 1.19 and 1.32

version 1.19, Sat Sep 13 12:04:56 1997 UTC version 1.32, Mon Jan 20 17:07:37 2003 UTC
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] erase
   : erase ( addr len -- ) 0 fill ;
   [THEN]
   
 [IFUNDEF] allocate  [IFUNDEF] allocate
 : reserve-mem here swap allot ;  : reserve-mem here swap allot ;
Line 32 
Line 36 
   
 \ 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 42 
Line 52 
   
 \ 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 65 
Line 76 
     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 81 
Line 92 
     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 105 
Line 117 
     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
       WHILE ( wordlist-link )
           dup 0 wordlist-link - ( wordlist-link wid )
           dup wordlist-map @ hashsearch-map =            dup wordlist-map @ hashsearch-map =
           IF 0 swap wordlist-extend ! ELSE drop THEN          IF ( wordlist-link wid )
     REPEAT drop ;              0 swap wordlist-extend !
           ELSE
               drop
           THEN
       REPEAT
       drop ;
   
 : rehashall  ( wid -- )  : rehashall  ( wid -- )
   drop revealed @    drop revealed @
Line 124 
Line 145 
   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 >=
   [ [IFUNDEF] allocate ]    [ [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
 has? 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
Line 175 
Line 199 
   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

Generate output suitable for use with a patch program
Legend:
Removed from v.1.19  
changed lines
  Added in v.1.32
CVS Admin

Powered by ViewCVS 1.0-dev 		(Powered by ViewCVS)

ViewCVS and CVS Help