[BACK]Return to hash.fs CVS log [TXT] [DIR] Up to [gforth] / gforth

Diff for /gforth/hash.fs between versions 1.20 and 1.28

version 1.20, 1998/05/02 21:28:42 version 1.28, 2001/09/04 09:17:02
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  Variable revealed Line 52  Variable revealed
   
 \ Memory handling                                      10oct94py  \ Memory handling                                      10oct94py
   
 Variable HashPointer  AVariable HashPointer
 Variable HashIndex  Variable HashIndex
 0 Value HashTable  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  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 88  Defer hash-alloc Line 98  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 96  Defer hash-alloc Line 107  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 104  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 124  Defer hash-alloc Line 144  Defer hash-alloc
   IF   inithash    IF   inithash
   ELSE rehashall THEN ;    ELSE rehashall THEN ;
   
 \ >rom ?!  const Create (hashsearch-map)
 align here    ' hash-find A, ' hash-reveal A, ' (rehash) A, ' (rehash) A,  ' hash-find A, ' hash-reveal A, ' (rehash) A, ' (rehash) A,
 to hashsearch-map  (hashsearch-map) 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
Line 150  to hashsearch-map Line 170  to hashsearch-map
 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
Removed from v.1.20  
changed lines
  Added in v.1.28

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