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

Makefile update

release
Slava Pestov 2007-10-29 01:46:34 -04:00
parent d124669dc5
commit fa126b0b72
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -38,7 +38,8 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
vm/types.o \ vm/types.o \
vm/quotations.o \ vm/quotations.o \
vm/utilities.o \ vm/utilities.o \
vm/errors.o vm/errors.o \
vm/profiler.o
EXE_OBJS = $(PLAF_EXE_OBJS) EXE_OBJS = $(PLAF_EXE_OBJS)

6
core/assocs/assocs.factor
View File

@ -98,9 +98,9 @@ M: assoc assoc-clone-like ( assoc exemplar -- newassoc )
2dup subassoc? >r swap subassoc? r> and ; 2dup subassoc? >r swap subassoc? r> and ;
: assoc-hashcode ( n assoc -- code ) : assoc-hashcode ( n assoc -- code )
swap [ [
tuck swap hashcode* >r swap hashcode* 2/ r> bitxor >r over r> hashcode* 2/ >r dupd hashcode* r> bitxor
] curry { } assoc>map hashcode ; ] { } assoc>map hashcode* ;
: intersect ( assoc1 assoc2 -- intersection ) : intersect ( assoc1 assoc2 -- intersection )
swap [ nip key? ] curry assoc-subset ; swap [ nip key? ] curry assoc-subset ;