steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "sequences: change to use tuple-hashcode algorithm, make string-hashcode work like old sequence-hashcode." 

This reverts commit 7b7b0d4542.
db4
John Benediktsson 2011-10-06 08:37:05 -07:00
parent 7b76c26bc0
commit 3e20365cbe
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/sequences/sequences-docs.factor
View File

@ -1309,7 +1309,13 @@ HELP: sequence-hashcode
{ $values { $values
{ "n" integer } { "seq" sequence } { "n" integer } { "seq" sequence }
{ "x" integer } } { "x" integer } }
{ $description "Iterates over a sequence, computes a hashcode with " { $link hashcode* } " for each element, and combines them." } ; { $description "Iterates over a sequence, computes a hashcode with " { $link hashcode* } " for each element, and combines them using " { $link sequence-hashcode-step } "." } ;
HELP: sequence-hashcode-step
{ $values
{ "oldhash" integer } { "newpart" integer }
{ "newhash" integer } }
{ $description "An implementation word that computes a running hashcode of a sequence using some bit-twiddling. The resulting hashcode is always a fixnum." } ;
HELP: short HELP: short
{ $values { $values

20
core/sequences/sequences.factor
View File

@ -600,14 +600,18 @@ ERROR: assert-sequence got expected ;
: assert-sequence= ( a b -- ) : assert-sequence= ( a b -- )
2dup sequence= [ 2drop ] [ assert-sequence ] if ; 2dup sequence= [ 2drop ] [ assert-sequence ] if ;
: sequence-hashcode ( depth seq -- hash ) <PRIVATE
[
[ drop 1000003 HEX: 345678 ] dip length : sequence-hashcode-step ( oldhash newpart -- newhash )
[ dup fixnum+fast 82520 fixnum+fast ] [ iota ] bi >fixnum swap [
] 2keep [ [ -2 fixnum-shift-fast ] [ 5 fixnum-shift-fast ] bi
swapd nth-unsafe hashcode* rot fixnum-bitxor fixnum+fast fixnum+fast
pick fixnum*fast [ [ fixnum+fast ] keep ] dip swap ] keep fixnum-bitxor ; inline
] 2curry each drop nip 97531 fixnum+fast ; inline
PRIVATE>
: sequence-hashcode ( n seq -- x )
[ 0 ] 2dip [ hashcode* sequence-hashcode-step ] with each ; inline
M: reversed equal? over reversed? [ sequence= ] [ 2drop f ] if ; M: reversed equal? over reversed? [ sequence= ] [ 2drop f ] if ;

8
core/strings/strings.factor
View File

@ -13,14 +13,8 @@ IN: strings
: reset-string-hashcode ( str -- ) : reset-string-hashcode ( str -- )
f swap set-string-hashcode ; inline f swap set-string-hashcode ; inline
: string-hashcode-step ( oldhash newpart -- newhash )
>fixnum swap [
[ -2 fixnum-shift-fast ] [ 5 fixnum-shift-fast ] bi
fixnum+fast fixnum+fast
] keep fixnum-bitxor ; inline
: rehash-string ( str -- ) : rehash-string ( str -- )
[ 0 [ string-hashcode-step ] reduce ] keep set-string-hashcode ; inline 1 over sequence-hashcode swap set-string-hashcode ; inline
: (aux) ( n string -- byte-array m ) : (aux) ( n string -- byte-array m )
aux>> { byte-array } declare swap 1 fixnum-shift-fast ; inline aux>> { byte-array } declare swap 1 fixnum-shift-fast ; inline