--- gforth/hash.fs 1996/11/15 21:19:29 1.17 +++ gforth/hash.fs 2006/05/01 09:45:56 1.34 @@ -1,6 +1,6 @@ \ Hashed dictionaries 15jul94py -\ Copyright (C) 1995 Free Software Foundation, Inc. +\ Copyright (C) 1995,1998,2000,2003 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -16,35 +16,59 @@ \ 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. +\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. -11 value hashbits +[IFUNDEF] erase +: erase ( addr len -- ) 0 fill ; +[THEN] + +[IFUNDEF] allocate +: reserve-mem here swap allot ; +\ move to a kernel/memory.fs +[ELSE] +: reserve-mem allocate throw ; +[THEN] + +[IFUNDEF] hashbits +11 Value hashbits +[THEN] 1 hashbits lshift Value Hashlen +\ 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 +: hash ( addr len -- key ) + hashbits (hashkey1) ; +[THEN] + Variable insRule insRule on Variable revealed \ Memory handling 10oct94py -Variable HashPointer -Variable HashIndex -0 Value HashTable +AVariable HashPointer +Variable HashIndex \ Number of wordlists +Variable HashPop \ Number of words +0 AValue HashTable + +\ forward declarations +0 AValue hashsearch-map +Defer hash-alloc ( addr -- addr ) \ DelFix and NewFix are from bigFORTH 15jul94py : DelFix ( addr root -- ) dup @ 2 pick ! ! ; : NewFix ( root len # -- addr ) - BEGIN 2 pick @ ?dup 0= WHILE 2dup * allocate throw + BEGIN 2 pick @ ?dup 0= WHILE 2dup * reserve-mem over 0 ?DO dup 4 pick DelFix 2 pick + LOOP drop REPEAT >r drop r@ @ rot ! r@ swap erase r> ; -\ compute hash key 15jul94py - -: hash ( addr len -- key ) - hashbits (hashkey1) ; -\ (hashkey) -\ 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} @@ -52,7 +76,7 @@ Variable HashIndex cells HashTable + ; : hash-find ( addr len wordlist -- nfa / false ) - >r 2dup r> bucket @ (hashfind) ; + >r 2dup r> bucket @ (hashlfind) ; \ hash vocabularies 16jul94py @@ -60,10 +84,6 @@ Variable HashIndex BEGIN dup @ dup WHILE nip REPEAT drop ! ; : (reveal ( nfa wid -- ) - dup wordlist-extend @ 0< - IF - 2drop EXIT - THEN over name>string rot bucket >r HashPointer 2 Cells $400 NewFix tuck cell+ ! r> insRule @ @@ -72,77 +92,117 @@ Variable HashIndex ELSE lastlink! THEN - revealed on ; + revealed on 1 HashPop +! 0 hash-alloc drop ; : hash-reveal ( nfa wid -- ) 2dup (reveal) (reveal ; +: inithash ( wid -- ) + wordlist-extend + insRule @ >r insRule off 1 hash-alloc over ! 3 cells - + dup wordlist-id + BEGIN @ dup WHILE 2dup swap (reveal REPEAT + 2drop r> insRule ! ; + : addall ( -- ) - voclink - BEGIN @ dup @ WHILE dup 'initvoc REPEAT drop ; + HashPop off voclink + BEGIN @ dup WHILE + dup 0 wordlist-link - + dup wordlist-map @ reveal-method @ ['] hash-reveal = + IF inithash ELSE drop THEN + REPEAT drop ; : clearhash ( -- ) HashTable Hashlen cells bounds DO I @ BEGIN dup WHILE - dup @ swap HashPointer DelFix - REPEAT I ! - cell +LOOP HashIndex off ; - -: re-hash clearhash addall ; -: (rehash) ( addr -- ) - drop revealed @ IF re-hash revealed off THEN ; + dup @ swap HashPointer DelFix + REPEAT + I ! + cell +LOOP + HashIndex off + voclink + BEGIN ( wordlist-link-addr ) + @ dup + WHILE ( wordlist-link ) + dup 0 wordlist-link - ( wordlist-link wid ) + dup wordlist-map @ hashsearch-map = + IF ( wordlist-link wid ) + 0 swap wordlist-extend ! + ELSE + drop + THEN + REPEAT + drop ; + +: rehashall ( wid -- ) + drop revealed @ + IF clearhash addall revealed off + THEN ; -Create hashsearch-map ( -- wordlist-map ) - ' hash-find A, ' hash-reveal A, ' (rehash) A, +: (rehash) ( wid -- ) + dup wordlist-extend @ 0= + IF inithash + ELSE rehashall THEN ; + +: hashdouble ( -- ) + HashTable >r clearhash + 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-alloc ( addr -- addr ) HashTable 0= IF - Hashlen cells allocate throw TO HashTable - HashTable Hashlen cells erase THEN - HashIndex @ over ! 1 HashIndex +! +:noname ( n+ -- n ) + HashTable 0= + IF Hashlen cells reserve-mem TO HashTable + HashTable Hashlen cells erase THEN + HashIndex @ swap HashIndex +! HashIndex @ Hashlen >= - IF HashTable >r clearhash - 1 hashbits 1+ dup to hashbits lshift to hashlen - r> free >r 0 to HashTable - addall r> throw - THEN ; - -: (initvoc) ( addr -- ) - cell+ dup @ 0< IF drop EXIT THEN - dup 2 cells - @ hashsearch-map <> IF drop EXIT THEN - insRule @ >r insRule off hash-alloc 3 cells - dup - BEGIN @ dup WHILE 2dup swap (reveal REPEAT - 2drop r> insRule ! ; - -' (initvoc) IS 'initvoc + [ [IFUNDEF] allocate ] + ABORT" no more space in hashtable" + [ [ELSE] ] + HashPop @ hashlen 2* >= or + IF hashdouble THEN + [ [THEN] ] ; is hash-alloc \ Hash-Find 01jan93py - +has? cross 0= +[IF] : make-hash - Root hashsearch-map context @ cell+ ! - Forth hashsearch-map context @ cell+ ! - addall \ Baum aufbauen -; + hashsearch-map forth-wordlist wordlist-map ! + addall ; + make-hash \ Baumsuche ist installiert. +[ELSE] + hashsearch-map forth-wordlist wordlist-map ! +[THEN] -make-hash \ Baumsuche ist installiert. +\ for ec version display that vocabulary goes hashed -: hash-cold ( -- ) Defers 'cold +: hash-cold ( -- ) +[ has? ec [IF] ] ." Hashing..." [ [THEN] ] HashPointer off 0 TO HashTable HashIndex off - voclink - BEGIN @ dup @ WHILE - dup cell - @ >r - dup 'initvoc - r> over cell - ! - REPEAT drop ; -' hash-cold ' 'cold >body ! + addall +\ voclink +\ BEGIN @ dup WHILE +\ dup 0 wordlist-link - initvoc +\ REPEAT drop +[ has? ec [IF] ] ." Done" cr [ [THEN] ] ; + +:noname ( -- ) + defers 'cold + hash-cold +; is 'cold : .words ( -- ) base @ >r hex HashTable Hashlen 0 DO cr i 2 .r ." : " dup i cells + BEGIN @ dup WHILE - dup cell+ @ .name REPEAT drop + dup cell+ @ name>string type space REPEAT drop LOOP drop r> base ! ; \ \ this stuff is for evaluating the hash function