From fa126b0b7248e9ee7176bae403f858cfbed26c81 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Oct 2007 01:46:34 -0400 Subject: [PATCH] Makefile update --- Makefile | 3 ++- core/assocs/assocs.factor | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 378f96deae..a67f24f19d 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,8 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \ vm/types.o \ vm/quotations.o \ vm/utilities.o \ - vm/errors.o + vm/errors.o \ + vm/profiler.o EXE_OBJS = $(PLAF_EXE_OBJS) diff --git a/core/assocs/assocs.factor b/core/assocs/assocs.factor index 95b5dd9600..272a763b7b 100644 --- a/core/assocs/assocs.factor +++ b/core/assocs/assocs.factor @@ -98,9 +98,9 @@ M: assoc assoc-clone-like ( assoc exemplar -- newassoc ) 2dup subassoc? >r swap subassoc? r> and ; : assoc-hashcode ( n assoc -- code ) - swap [ - tuck swap hashcode* >r swap hashcode* 2/ r> bitxor - ] curry { } assoc>map hashcode ; + [ + >r over r> hashcode* 2/ >r dupd hashcode* r> bitxor + ] { } assoc>map hashcode* ; : intersect ( assoc1 assoc2 -- intersection ) swap [ nip key? ] curry assoc-subset ;