Merge branch 'master' into new_ui

basis/compiler/cfg/linear-scan/linear-scan-tests.factor

@@ -1,7 +1,7 @@
 IN: compiler.cfg.linear-scan.tests
 USING: tools.test random sorting sequences sets hashtables assocs
 kernel fry arrays splitting namespaces math accessors vectors
-math.order
+math.order grouping
 cpu.architecture
 compiler.cfg.instructions
 compiler.cfg.registers

basis/grouping/grouping-tests.factor

@@ -1,4 +1,5 @@
-USING: grouping tools.test kernel sequences arrays ;
+USING: grouping tools.test kernel sequences arrays
+math ;
 IN: grouping.tests
 
 [ { 1 2 3 } 0 group ] must-fail

basis/io/files/unix/unix-tests.factor

@@ -1,7 +1,8 @@
 USING: tools.test io.files io.files.temp io.pathnames
 io.directories io.files.info io.files.info.unix continuations
 kernel io.files.unix math.bitwise calendar accessors
-math.functions math unix.users unix.groups arrays sequences ;
+math.functions math unix.users unix.groups arrays sequences
+grouping ;
 IN: io.files.unix.tests
 
 [ "/usr/libexec/" ] [ "/usr/libexec/awk/" parent-directory ] unit-test

basis/roman/roman.factor

@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays assocs kernel math math.order math.vectors
 namespaces make quotations sequences splitting.monotonic
-sequences.private strings unicode.case lexer parser ;
+sequences.private strings unicode.case lexer parser
+grouping ;
 IN: roman
 
 <PRIVATE

core/generic/standard/standard-tests.factor

@@ -4,7 +4,8 @@ generic.standard strings sequences arrays kernel accessors words
 specialized-arrays.double byte-arrays bit-arrays parser
 namespaces make quotations stack-checker vectors growable
 hashtables sbufs prettyprint byte-vectors bit-vectors
-specialized-vectors.double definitions generic sets graphs assocs ;
+specialized-vectors.double definitions generic sets graphs assocs
+grouping ;
 
 GENERIC: lo-tag-test ( obj -- obj' )
 

core/kernel/kernel-tests.factor

@@ -1,7 +1,7 @@
 USING: arrays byte-arrays kernel kernel.private math memory
 namespaces sequences tools.test math.private quotations
 continuations prettyprint io.streams.string debugger assocs
-sequences.private accessors locals.backend ;
+sequences.private accessors locals.backend grouping ;
 IN: kernel.tests
 
 [ 0 ] [ f size ] unit-test

core/math/floats/floats-tests.factor

@@ -1,4 +1,5 @@
-USING: kernel math math.constants tools.test sequences ;
+USING: kernel math math.constants tools.test sequences
+grouping ;
 IN: math.floats.tests
 
 [ t ] [ 0.0 float? ] unit-test

core/sorting/sorting-tests.factor

@@ -1,5 +1,5 @@
 USING: sorting sequences kernel math math.order random
-tools.test vectors sets vocabs ;
+tools.test vectors sets vocabs grouping ;
 IN: sorting.tests
 
 [ { } ] [ { } natural-sort ] unit-test

core/vocabs/loader/loader-tests.factor

@@ -3,7 +3,7 @@ USING: vocabs.loader tools.test continuations vocabs math
 kernel arrays sequences namespaces io.streams.string
 parser source-files words assocs classes.tuple definitions
 debugger compiler.units tools.vocabs accessors eval
-combinators vocabs.parser ;
+combinators vocabs.parser grouping ;
 
 ! This vocab should not exist, but just in case...
 [ ] [

extra/project-euler/052/052.factor

@@ -1,7 +1,8 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.short-circuit kernel math
-    project-euler.common sequences sorting ;
+    project-euler.common sequences sorting
+    grouping ;
 IN: project-euler.052
 
 ! http://projecteuler.net/index.php?section=problems&id=52