--- gforth/hash.fs	1994/10/18 15:51:18	1.4
+++ gforth/hash.fs	1996/01/07 17:22:10	1.11
@@ -1,6 +1,24 @@
 \ Hashed dictionaries                                  15jul94py
 
-9 value hashbits
+\ Copyright (C) 1995 Free Software Foundation, Inc.
+
+\ This file is part of Gforth.
+
+\ Gforth is free software; you can redistribute it and/or
+\ modify it under the terms of the GNU General Public License
+\ as published by the Free Software Foundation; either version 2
+\ of the License, or (at your option) any later version.
+
+\ This program is distributed in the hope that it will be useful,
+\ but WITHOUT ANY WARRANTY; without even the implied warranty of
+\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\ GNU General Public License for more details.
+
+\ 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.
+
+11 value hashbits
 1 hashbits lshift Value Hashlen
 
 Variable insRule        insRule on
@@ -29,7 +47,7 @@ Variable HashIndex
 
 
 : hash-find ( addr len wordlist -- nfa / false )
-    $C + @ >r
+    [ 3 cells ] Literal + @ >r
     2dup hash r> xor cells HashTable @ + @ (hashfind) ;
 
 \ hash vocabularies                                    16jul94py
@@ -37,9 +55,9 @@ Variable HashIndex
 : lastlink! ( addr link -- )
   BEGIN  dup @ dup  WHILE  nip  REPEAT  drop ! ;
 
-: (reveal ( addr voc -- )  $C + dup @ 0< IF  2drop EXIT  THEN
-  @ over cell+ count $1F and Hash xor cells >r
-  HashPointer 8 $400 NewFix
+: (reveal ( addr voc -- )  [ 3 cells ] Literal + dup @ 0< IF  2drop EXIT  THEN
+  @ over name>string Hash xor cells >r
+  HashPointer 2 Cells $400 NewFix
   tuck cell+ ! r> HashTable @ + insRule @
   IF  dup @ 2 pick ! !  ELSE  lastlink!  THEN  revealed on ;
 
@@ -58,9 +76,9 @@ Variable HashIndex
         REPEAT  I !
     cell +LOOP  HashIndex off ;
 
-: rehash  clearhash addall ;
+: re-hash  clearhash addall ;
 : (rehash) ( addr -- )
-  drop revealed @ IF  rehash revealed off  THEN ;
+  drop revealed @ IF  re-hash revealed off  THEN ;
 
 Create hashsearch  ' hash-find A, ' hash-reveal A, ' (rehash) A,
 
@@ -91,6 +109,16 @@ Create hashsearch  ' hash-find A, ' hash
 addall          \ Baum aufbauen
 \ Baumsuche ist installiert.
 
+: hash-cold  ( -- ) Defers 'cold
+  HashPointer off  HashTable off  HashIndex off
+  voclink
+  BEGIN  @ dup @  WHILE
+         dup cell - @ >r
+         dup 'initvoc
+         r> over cell - !
+  REPEAT  drop ;
+' hash-cold IS 'cold
+
 : .words  ( -- )
   base @ >r hex HashTable @  Hashlen 0
   DO  cr  i 2 .r ." : " dup i cells +