--- gforth/hash.fs 2002/11/24 19:49:45 1.29 +++ gforth/hash.fs 2009/12/06 23:00:03 1.38 @@ -1,12 +1,12 @@ \ Hashed dictionaries 15jul94py -\ Copyright (C) 1995,1998,2000 Free Software Foundation, Inc. +\ Copyright (C) 1995,1998,2000,2003,2006,2007 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 +\ as published by the Free Software Foundation, either version 3 \ of the License, or (at your option) any later version. \ This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA. +\ along with this program. If not, see http://www.gnu.org/licenses/. [IFUNDEF] erase : erase ( addr len -- ) 0 fill ; @@ -166,7 +165,7 @@ const Create (hashsearch-map) [ [IFUNDEF] allocate ] ABORT" no more space in hashtable" [ [ELSE] ] - HashPop @ 1 hashbits lshift >= or + HashPop @ hashlen 2* >= or IF hashdouble THEN [ [THEN] ] ; is hash-alloc @@ -193,7 +192,10 @@ has? cross 0= \ REPEAT drop [ has? ec [IF] ] ." Done" cr [ [THEN] ] ; -' hash-cold INIT8 chained +:noname ( -- ) + defers 'cold + hash-cold +; is 'cold : .words ( -- ) base @ >r hex HashTable Hashlen 0 @@ -223,3 +225,15 @@ has? cross 0= \ : chisq ( -- n ) \ \ n should have about the same size as Hashlen \ 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 ;