Merge branch 'master' into regexp

diff --combined core/assocs/assocs.factor
index 35e7535aa71f33007d651bbc0fbc06feac6fdd27,c4deddae3949d97fa1104782cfba7d4e25fe1cde..0c0667e730348d69d3c07073258ee4c8e48480b0
--- 1/core/assocs/assocs.factor
--- 2/core/assocs/assocs.factor
+++ b/core/assocs/assocs.factor
@@@ -41,7 -41,7 +41,7 @@@ M: assoc assoc-like drop 
  : substituter ( assoc -- quot )
      [ ?at drop ] curry ; inline
  
 -: with-assoc ( assoc quot: ( value key -- assoc ) -- quot: ( key value -- ) )
 +: with-assoc ( assoc quot: ( value key assoc -- ) -- quot: ( key value -- ) )
      curry [ swap ] prepose ; inline
  
  PRIVATE>
@@@ -71,7 -71,7 +71,7 @@@
  
  : assoc-partition ( assoc quot -- true-assoc false-assoc )
      [ (assoc-each) partition ] [ drop ] 2bi
-     tuck [ assoc-like ] 2bi@ ; inline
+     [ assoc-like ] curry bi@ ; inline
  
  : assoc-any? ( assoc quot -- ? )
      assoc-find 2nip ; inline