improve 'equal' hashing on lists

svn: r13332
This commit is contained in:
Matthew Flatt 2009-01-31 03:04:09 +00:00
parent f6493e1c32
commit 1b79030aac

View File

@ -1022,7 +1022,11 @@ static long equal_hash_key(Scheme_Object *o, long k, Hash_Info *hi)
{ {
# include "mzhashchk.inc" # include "mzhashchk.inc"
hi->depth += 2; hi->depth += 2;
k = (k << 3) + k;
k += equal_hash_key(SCHEME_CAR(o), 0, hi); k += equal_hash_key(SCHEME_CAR(o), 0, hi);
/* If it's a list, don't count cdr direction as depth: */
if (scheme_is_list(o))
hi->depth -= 2;
o = SCHEME_CDR(o); o = SCHEME_CDR(o);
break; break;
} }
@ -1030,6 +1034,7 @@ static long equal_hash_key(Scheme_Object *o, long k, Hash_Info *hi)
{ {
# include "mzhashchk.inc" # include "mzhashchk.inc"
hi->depth += 2; hi->depth += 2;
k = (k << 3) + k;
k += equal_hash_key(SCHEME_CAR(o), 0, hi); k += equal_hash_key(SCHEME_CAR(o), 0, hi);
o = SCHEME_CDR(o); o = SCHEME_CDR(o);
break; break;