Merge branch 'master' into sorting

Conflicts:
	basis/heaps/heaps-tests.factor

diff --cc basis/math/statistics/statistics.factor
index 47090fa8b85787d016983f640cd9aaa33ad8a3ed,ae7114423bf8d14488729fd874adb56a0a262450..3bd099dd07e7bf10226681c79da1fb4b8738bd41
--- 1/basis/math/statistics/statistics.factor
--- 2/basis/math/statistics/statistics.factor
+++ b/basis/math/statistics/statistics.factor
@@@ -74,16 -73,19 +73,19 @@@ PRIVATE
      H{ } sequence>assoc ; inline
  
  : histogram! ( hashtable seq -- hashtable )
-     [ inc-at ] sequence>assoc! ;
+     [ ] [ inc-at ] sequence>assoc! ;
  
  : histogram ( seq -- hashtable )
-     [ inc-at ] sequence>hashtable ;
+     [ ] [ inc-at ] sequence>hashtable ;
  
  : sorted-histogram ( seq -- alist )
 -    histogram >alist sort-values ;
 +    histogram sort-values ;
  
- : collect-values ( seq quot: ( obj hashtable -- ) -- hash )
-     '[ [ dup @ ] dip push-at ] sequence>hashtable ; inline
+ : collect-pairs ( seq quot -- hashtable )
+     [ push-at ] sequence>hashtable ; inline
+ 
+ : collect-by ( seq quot -- hashtable )
+     [ dup ] prepose collect-pairs ; inline
  
  : mode ( seq -- x )
      histogram >alist