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

Revert "hashtables: make hash-combine use fixnum primitives." 

This reverts commit 390dd23261.
db4
John Benediktsson 2015-06-11 20:33:47 -07:00
parent 54c4388a68
commit 5083bdad33
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/hashtables/hashtables.factor
View File

@ -188,9 +188,7 @@ M: hashtable assoc-like
! magic number is 2^29/phi instead of 2^32/phi ! magic number is 2^29/phi instead of 2^32/phi
! due to max fixnum value on 32-bit machines ! due to max fixnum value on 32-bit machines
: hash-combine ( hash1 hash2 -- newhash ) : hash-combine ( hash1 hash2 -- newhash )
[ >fixnum ] bi@ [ 0x13c6ef37 fixnum+fast ] dip [ 0x13c6ef37 + ] dip [ 6 shift ] [ -2 shift ] bi + + ; inline
[ 6 fixnum-shift-fast ] [ -2 fixnum-shift-fast ] bi
fixnum+fast fixnum+fast ; inline
ERROR: malformed-hashtable-pair seq pair ; ERROR: malformed-hashtable-pair seq pair ;