hashtables: remove the 2hashcode word for now.

diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor
index 9ed45712886f647cd7f4a842cae189ae811a754e..33871d24574d7e3ae56c1e6495103ac5fdce1a91 100644 (file)
--- a/core/hashtables/hashtables.factor
+++ b/core/hashtables/hashtables.factor
@@ -192,9 +192,6 @@ M: hashtable assoc-like
     [ 6 fixnum-shift-fast ] [ -2 fixnum-shift-fast ] bi
     fixnum+fast fixnum+fast ; inline
 
-: 2hashcode ( obj1 obj2 -- hash )
-    [ hashcode ] bi@ hash-combine ; inline
-
 ERROR: malformed-hashtable-pair seq pair ;
 
 : check-hashtable ( seq -- seq )

diff --git a/core/words/words.factor b/core/words/words.factor
index 21549daa6bbc46806e84dfd30ee2f7b39784a988..b71e670e51da7cab6a14123aa9b46051cb8c4e5e 100644 (file)
--- a/core/words/words.factor
+++ b/core/words/words.factor
@@ -188,7 +188,7 @@ M: word reset-word
     ] tri ;
 
 : <word> ( name vocab -- word )
-    2dup 2hashcode >fixnum (word) dup new-word ;
+    2dup [ hashcode ] bi@ hash-combine >fixnum (word) dup new-word ;
 
 : <uninterned-word> ( name -- word )
     f \ <uninterned-word> counter >fixnum (word)