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

Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2008-11-12 00:40:11 -06:00
parent 0d3a5e372a 9f52ee50b0
commit 9656ce2e65
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/compiler/compiler.factor
View File

@ -119,7 +119,7 @@ t compile-dependencies? set-global
H{ } clone compiled set H{ } clone compiled set
[ queue-compile ] each [ queue-compile ] each
compile-queue get compile-loop compile-queue get compile-loop
compiled get >alist >array compiled get >alist
] with-scope ; ] with-scope ;
: enable-compiler ( -- ) : enable-compiler ( -- )

16
core/hashtables/hashtables.factor
View File

@ -128,15 +128,25 @@ M: hashtable set-at ( value key hash -- )
: associate ( value key -- hash ) : associate ( value key -- hash )
2 <hashtable> [ set-at ] keep ; 2 <hashtable> [ set-at ] keep ;
<PRIVATE
: push-unsafe ( elt seq -- )
[ length ] keep
[ underlying>> set-array-nth ]
[ >r 1+ r> (>>length) ]
2bi ; inline
PRIVATE>
M: hashtable >alist M: hashtable >alist
array>> [ length 2/ ] keep V{ } clone [ [ array>> [ length 2/ ] keep ] [ assoc-size <vector> ] bi [
[ [
>r >r
>r 1 fixnum-shift-fast r> >r 1 fixnum-shift-fast r>
[ array-nth ] [ >r 1 fixnum+fast r> array-nth ] 2bi r> [ array-nth ] [ >r 1 fixnum+fast r> array-nth ] 2bi r>
pick tombstone? [ 3drop ] [ [ 2array ] dip push ] if pick tombstone? [ 3drop ] [ [ 2array ] dip push-unsafe ] if
] 2curry each ] 2curry each
] keep ; ] keep { } like ;
M: hashtable clone M: hashtable clone
(clone) [ clone ] change-array ; (clone) [ clone ] change-array ;