factor: Move math.ranges => ranges.

Fixups will help people migrate their code.

diff --git a/basis/bloom-filters/bloom-filters.factor b/basis/bloom-filters/bloom-filters.factor
index 0a279ba8af916fe7b52a285cc8b75f4b70456adb..147e8bba448030a14eb8d8b8ec2dfb24bd0e45f2 100644 (file)
--- a/basis/bloom-filters/bloom-filters.factor
+++ b/basis/bloom-filters/bloom-filters.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays bit-arrays fry kernel kernel.private
 layouts locals math math.functions math.order math.private
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays bit-arrays fry kernel kernel.private
 layouts locals math math.functions math.order math.private

-math.ranges multiline sequences sequences.private typed ;
+ranges multiline sequences sequences.private typed ;

 
 IN: bloom-filters
 
 
 IN: bloom-filters
 

diff --git a/basis/bootstrap/assembler/ppc.32.linux.factor b/basis/bootstrap/assembler/ppc.32.linux.factor
index da83cef08dcc57fb89e4538fca414b55906ab4ec..07e7055636e85ad3f01c9acffdec0237792c8bc5 100644 (file)
--- a/basis/bootstrap/assembler/ppc.32.linux.factor
+++ b/basis/bootstrap/assembler/ppc.32.linux.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2011 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2011 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: parser system kernel sequences math math.ranges
+USING: parser system kernel sequences math ranges

 cpu.ppc.assembler combinators compiler.constants
 bootstrap.image.private layouts namespaces ;
 IN: bootstrap.ppc
 cpu.ppc.assembler combinators compiler.constants
 bootstrap.image.private layouts namespaces ;
 IN: bootstrap.ppc

diff --git a/basis/bootstrap/assembler/ppc.64.linux.factor b/basis/bootstrap/assembler/ppc.64.linux.factor
index 9ec4d373737547ec2ebb7297b653307e805ee2df..670389fa696dc3e6a2bb640160d71c363722049f 100644 (file)
--- a/basis/bootstrap/assembler/ppc.64.linux.factor
+++ b/basis/bootstrap/assembler/ppc.64.linux.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2011 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2011 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: parser system kernel sequences math math.ranges
+USING: parser system kernel sequences math ranges

 cpu.ppc.assembler combinators compiler.constants
 bootstrap.image.private layouts namespaces ;
 IN: bootstrap.ppc
 cpu.ppc.assembler combinators compiler.constants
 bootstrap.image.private layouts namespaces ;
 IN: bootstrap.ppc

diff --git a/basis/bootstrap/assembler/ppc.factor b/basis/bootstrap/assembler/ppc.factor
index 3f45aba7f6fbc0eb7198726f726ae208f44c68be..43b978ef0ba3d9cb86b2020bfd75b41809250a9d 100644 (file)
--- a/basis/bootstrap/assembler/ppc.factor
+++ b/basis/bootstrap/assembler/ppc.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image.private kernel kernel.private namespaces
 system cpu.ppc.assembler compiler.units compiler.constants math
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image.private kernel kernel.private namespaces
 system cpu.ppc.assembler compiler.units compiler.constants math

-math.private math.ranges layouts words vocabs slots.private
+math.private ranges layouts words vocabs slots.private

 locals locals.backend generic.single.private fry sequences
 threads.private strings.private ;
 FROM: cpu.ppc.assembler => B ;
 locals locals.backend generic.single.private fry sequences
 threads.private strings.private ;
 FROM: cpu.ppc.assembler => B ;

diff --git a/basis/calendar/calendar-tests.factor b/basis/calendar/calendar-tests.factor
index ec90ce8afb1c9e5817c7cab441f94954662273ac..056def163e9ebf09683052ab9a7dba12ca85d457 100644 (file)
--- a/basis/calendar/calendar-tests.factor
+++ b/basis/calendar/calendar-tests.factor
@@ -1,4 +1,4 @@
-USING: accessors grouping kernel math math.order math.ranges
+USING: accessors grouping kernel math math.order ranges

 math.vectors random sequences threads tools.test ;
 IN: calendar
 
 math.vectors random sequences threads tools.test ;
 IN: calendar
 

diff --git a/basis/calendar/calendar.factor b/basis/calendar/calendar.factor
index 53aaf3dbdb6011cfcc97610557acbb66ac797cd3..e7caa89d323fd833519ecd2579f73b4cc2f101d1 100644 (file)
--- a/basis/calendar/calendar.factor
+++ b/basis/calendar/calendar.factor
@@ -4,7 +4,7 @@ USING: accessors arrays classes.tuple combinators
 combinators.short-circuit kernel literals math math.functions
 math.intervals math.order math.statistics sequences slots.syntax
 system vocabs vocabs.loader ;
 combinators.short-circuit kernel literals math math.functions
 math.intervals math.order math.statistics sequences slots.syntax
 system vocabs vocabs.loader ;

-FROM: math.ranges => [a..b) ;
+FROM: ranges => [a..b) ;

 IN: calendar
 
 ERROR: not-in-interval value interval ;
 IN: calendar
 
 ERROR: not-in-interval value interval ;

diff --git a/basis/calendar/format/format.factor b/basis/calendar/format/format.factor
index 7792ae935d26d90bc46510ed45fa58f00ee2d5b2..9968ee7eb6e15e7118f60acdc09bb82f00522224 100644 (file)
--- a/basis/calendar/format/format.factor
+++ b/basis/calendar/format/format.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays calendar calendar.english combinators
 formatting grouping io io.streams.string kernel make math
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays calendar calendar.english combinators
 formatting grouping io io.streams.string kernel make math

-math.order math.parser math.parser.private math.ranges present
+math.order math.parser math.parser.private ranges present

 quotations sequences splitting strings words ;
 IN: calendar.format
 
 quotations sequences splitting strings words ;
 IN: calendar.format
 

diff --git a/basis/cbor/cbor-tests.factor b/basis/cbor/cbor-tests.factor
index 63338db5a8a9896635bac8bc2960790fe06e8d7c..0d356f3297762efe536c2c552d0dadf0bb58004d 100644 (file)
--- a/basis/cbor/cbor-tests.factor
+++ b/basis/cbor/cbor-tests.factor
@@ -1,5 +1,5 @@
 USING: arrays assocs calendar cbor kernel literals locals math
 USING: arrays assocs calendar cbor kernel literals locals math

-math.parser math.ranges tools.test urls ;
+math.parser ranges tools.test urls ;

 
 {
     { 0 "00" }
 
 {
     { 0 "00" }

diff --git a/basis/checksums/adler-32/adler-32.factor b/basis/checksums/adler-32/adler-32.factor
index e855cdf22e795a3340a2a6165b874803cc7ed0d3..9ada46370d83fa70ba392edf4b9ac96558a7c07f 100644 (file)
--- a/basis/checksums/adler-32/adler-32.factor
+++ b/basis/checksums/adler-32/adler-32.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: checksums classes.singleton kernel math math.ranges
+USING: checksums classes.singleton kernel math ranges

 math.vectors sequences ;
 IN: checksums.adler-32
 
 math.vectors sequences ;
 IN: checksums.adler-32
 

diff --git a/basis/checksums/fnv1/fnv1.factor b/basis/checksums/fnv1/fnv1.factor
index f60e97dbf49a8771e0195ab968e05dfcd100d1e2..bd6c70da566845fdf963acd4d9190133324cbac9 100644 (file)
--- a/basis/checksums/fnv1/fnv1.factor
+++ b/basis/checksums/fnv1/fnv1.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Alaric Snell-Pym
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2009 Alaric Snell-Pym
 ! See http://factorcode.org/license.txt for BSD license.

-USING: checksums classes.singleton kernel math math.ranges
+USING: checksums classes.singleton kernel math ranges

 math.vectors sequences ;
 IN: checksums.fnv1
 
 math.vectors sequences ;
 IN: checksums.fnv1
 

diff --git a/basis/checksums/murmur/murmur.factor b/basis/checksums/murmur/murmur.factor
index 28576cf50bb91c252c57e9491dcc13325fb71f53..4a849f5962899e78b38f1bc0ffa8f3034e41973d 100644 (file)
--- a/basis/checksums/murmur/murmur.factor
+++ b/basis/checksums/murmur/murmur.factor
@@ -3,7 +3,7 @@
 
 USING: accessors alien alien.c-types alien.data byte-arrays
 checksums endian fry grouping kernel math math.bitwise
 
 USING: accessors alien alien.c-types alien.data byte-arrays
 checksums endian fry grouping kernel math math.bitwise

-math.ranges sequences ;
+ranges sequences ;

 
 IN: checksums.murmur
 
 
 IN: checksums.murmur
 

diff --git a/basis/checksums/sha/sha.factor b/basis/checksums/sha/sha.factor
index 43a3847ab1d6aeadb08771e84c4cc0a306ba06b3..7ce8dc851d4460f7752fb1b9a1c9210107eef837 100644 (file)
--- a/basis/checksums/sha/sha.factor
+++ b/basis/checksums/sha/sha.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types arrays checksums checksums.common
 combinators combinators.smart endian fry grouping kernel
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types arrays checksums checksums.common
 combinators combinators.smart endian fry grouping kernel

-kernel.private literals locals math math.bitwise math.ranges
+kernel.private literals locals math math.bitwise ranges

 sequences sequences.generalizations sequences.private
 specialized-arrays ;
 SPECIALIZED-ARRAY: uint
 sequences sequences.generalizations sequences.private
 specialized-arrays ;
 SPECIALIZED-ARRAY: uint

diff --git a/basis/checksums/superfast/superfast.factor b/basis/checksums/superfast/superfast.factor
index 518ca303aba2b347db067bed1f5c9507a714eddd..a128b42fcd6e002f6b84ae7b699b96e539f31a8d 100644 (file)
--- a/basis/checksums/superfast/superfast.factor
+++ b/basis/checksums/superfast/superfast.factor
@@ -3,7 +3,7 @@
 
 USING: accessors alien alien.c-types alien.data byte-arrays
 checksums combinators endian fry grouping kernel math
 
 USING: accessors alien alien.c-types alien.data byte-arrays
 checksums combinators endian fry grouping kernel math

-math.bitwise math.ranges sequences sequences.private ;
+math.bitwise ranges sequences sequences.private ;

 
 IN: checksums.superfast
 
 
 IN: checksums.superfast
 

diff --git a/basis/checksums/xxhash/xxhash.factor b/basis/checksums/xxhash/xxhash.factor
index 683afee52037d6efdfeec2604044892996569b1e..50e2a479def12e8876452967a2bb4025ad93cdc0 100644 (file)
--- a/basis/checksums/xxhash/xxhash.factor
+++ b/basis/checksums/xxhash/xxhash.factor
@@ -3,7 +3,7 @@
 
 USING: accessors alien alien.c-types alien.data byte-arrays
 checksums combinators endian generalizations grouping kernel
 
 USING: accessors alien alien.c-types alien.data byte-arrays
 checksums combinators endian generalizations grouping kernel

-locals math math.bitwise math.ranges sequences
+locals math math.bitwise ranges sequences

 specialized-arrays ;
 SPECIALIZED-ARRAY: uint64_t
 
 specialized-arrays ;
 SPECIALIZED-ARRAY: uint64_t
 

diff --git a/basis/colors/cmyk/cmyk-tests.factor b/basis/colors/cmyk/cmyk-tests.factor
index bd9894d5c192392f822f56670090f21366e39281..81bb8224d8ce9c93110605b14b8964f736dd0a98 100644 (file)
--- a/basis/colors/cmyk/cmyk-tests.factor
+++ b/basis/colors/cmyk/cmyk-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.cmyk kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.cmyk kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/colors/hsl/hsl-tests.factor b/basis/colors/hsl/hsl-tests.factor
index 09fafa6b2e662fa11225b280917fc2b696edf30a..07372ac33a4fc8b2933897d04e4d9bb2bfd218bf 100644 (file)
--- a/basis/colors/hsl/hsl-tests.factor
+++ b/basis/colors/hsl/hsl-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.hsl kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.hsl kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/colors/lab/lab-tests.factor b/basis/colors/lab/lab-tests.factor
index 3790bd2803c0434d28e092f47d7a1f8d114472d4..75f9621ebe8a8a106f36dae7b40060122372f656 100644 (file)
--- a/basis/colors/lab/lab-tests.factor
+++ b/basis/colors/lab/lab-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.lab kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.lab kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/colors/lch/lch-tests.factor b/basis/colors/lch/lch-tests.factor
index 6811cfbda5f60857d8fff279c347938b5cfd2e51..8f399dc2dbff410982f61c70f85daffcc01808b8 100644 (file)
--- a/basis/colors/lch/lch-tests.factor
+++ b/basis/colors/lch/lch-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.lch kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.lch kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/colors/luv/luv-tests.factor b/basis/colors/luv/luv-tests.factor
index c47365ae2f9e025317af08f8e2a59a94db07b095..2a4c9404e5967d2b378cf6820c711e6f6bc2a3ff 100644 (file)
--- a/basis/colors/luv/luv-tests.factor
+++ b/basis/colors/luv/luv-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.luv kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.luv kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/colors/ryb/ryb-tests.factor b/basis/colors/ryb/ryb-tests.factor
index 18bcd3812e1d07bc9337b253ddf887b863a98057..c798ed8d3dab0e2d7d25873f66a268e5c2bb9301 100644 (file)
--- a/basis/colors/ryb/ryb-tests.factor
+++ b/basis/colors/ryb/ryb-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.ryb kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.ryb kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/colors/xyy/xyy-tests.factor b/basis/colors/xyy/xyy-tests.factor
index d4c0b3ac4a6df3866b40aa6cc122680cd6edec50..d61d6ec96fd4c32e416d9d7e096ba0adae13bd7e 100644 (file)
--- a/basis/colors/xyy/xyy-tests.factor
+++ b/basis/colors/xyy/xyy-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.xyy kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.xyy kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/colors/xyz/xyz-tests.factor b/basis/colors/xyz/xyz-tests.factor
index 7984859f00dc8b8301c57d1ca1aae159663d26a9..fed448b198645f563e3cbd2f45b7841d950627d2 100644 (file)
--- a/basis/colors/xyz/xyz-tests.factor
+++ b/basis/colors/xyz/xyz-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.xyz kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.xyz kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/colors/yiq/yiq-tests.factor b/basis/colors/yiq/yiq-tests.factor
index dbb5b3f5b2549e744fe8913518d24ee12bf61fa0..63abda17082917fcad22c56af1166a3ca94bd8dd 100644 (file)
--- a/basis/colors/yiq/yiq-tests.factor
+++ b/basis/colors/yiq/yiq-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.yiq kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.yiq kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/colors/yuv/yuv-tests.factor b/basis/colors/yuv/yuv-tests.factor
index 024e7d4528869cd871eef446460df1579ba6d762..cab48d6a053b7e50a5ced435a6dc4e3d9aa48e8e 100644 (file)
--- a/basis/colors/yuv/yuv-tests.factor
+++ b/basis/colors/yuv/yuv-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.yuv kernel locals math.functions
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: arrays colors colors.yuv kernel locals math.functions

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { t } [
     0.0 1.0 0.1 <range> [| r |
 
 { t } [
     0.0 1.0 0.1 <range> [| r |

diff --git a/basis/compiler/cfg/dominance/dominance-tests.factor b/basis/compiler/cfg/dominance/dominance-tests.factor
index 66cb3211a87f83ec5a2d599d60dc37b99299ffbd..829349e967caf7e4fb99fc7e7217dae4feecb437 100644 (file)
--- a/basis/compiler/cfg/dominance/dominance-tests.factor
+++ b/basis/compiler/cfg/dominance/dominance-tests.factor
@@ -1,6 +1,6 @@
 USING: accessors arrays assocs compiler.cfg.dominance
 compiler.cfg.dominance.private compiler.cfg.utilities compiler.test
 USING: accessors arrays assocs compiler.cfg.dominance
 compiler.cfg.dominance.private compiler.cfg.utilities compiler.test

-grouping kernel math.ranges namespaces sequences sets tools.test ;
+grouping kernel ranges namespaces sequences sets tools.test ;

 IN: compiler.cfg.dominance.tests
 
 : test-dominance ( -- )
 IN: compiler.cfg.dominance.tests
 
 : test-dominance ( -- )

diff --git a/basis/compression/gzip/gzip.factor b/basis/compression/gzip/gzip.factor
index daf4622834dfa7379fe98f49651c2c8cec09a755..5d8d91d8d05c5d846631f9664241a65c413ef893 100644 (file)
--- a/basis/compression/gzip/gzip.factor
+++ b/basis/compression/gzip/gzip.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs bit-arrays byte-arrays
 combinators compression.huffman fry kernel literals locals make
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs bit-arrays byte-arrays
 combinators compression.huffman fry kernel literals locals make

-math math.bits math.order math.ranges namespaces sequences
+math math.bits math.order ranges namespaces sequences

 sequences.deep splitting vectors ;
 IN: compression.gzip
 
 sequences.deep splitting vectors ;
 IN: compression.gzip
 

diff --git a/basis/compression/huffman/huffman.factor b/basis/compression/huffman/huffman.factor
index 7744b458706833c0ecfc8a84aa6a0192e0645e95..8b6d7e29670db6cd85cba41d2c27dd07f135252c 100644 (file)
--- a/basis/compression/huffman/huffman.factor
+++ b/basis/compression/huffman/huffman.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs bit-arrays bitstreams combinators
 fry hashtables heaps io kernel locals math math.bits math.order
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs bit-arrays bitstreams combinators
 fry hashtables heaps io kernel locals math math.bits math.order

-math.parser math.ranges multiline namespaces sequences sorting
+math.parser ranges multiline namespaces sequences sorting

 vectors ;
 QUALIFIED-WITH: bitstreams bs
 IN: compression.huffman
 vectors ;
 QUALIFIED-WITH: bitstreams bs
 IN: compression.huffman

diff --git a/basis/compression/inflate/inflate.factor b/basis/compression/inflate/inflate.factor
index c6f22b912b4bb6ead18281113f0495b156403510..6f6053a92f34b70444db9833ed202b7c18d1ab44 100644 (file)
--- a/basis/compression/inflate/inflate.factor
+++ b/basis/compression/inflate/inflate.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs byte-vectors combinators
 combinators.smart compression.huffman endian fry hashtables
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs byte-vectors combinators
 combinators.smart compression.huffman endian fry hashtables

-kernel literals locals math math.bitwise math.order math.ranges
+kernel literals locals math math.bitwise math.order ranges

 sequences sorting memoize combinators.short-circuit byte-arrays ;
 QUALIFIED-WITH: bitstreams bs
 IN: compression.inflate
 sequences sorting memoize combinators.short-circuit byte-arrays ;
 QUALIFIED-WITH: bitstreams bs
 IN: compression.inflate

diff --git a/basis/compression/zlib/zlib.factor b/basis/compression/zlib/zlib.factor
index 90a53efe577435572c84a487d8a3bbb629005a1c..f7318500f5dcd0ebd7b8d97f70bf5a1c25ef8303 100644 (file)
--- a/basis/compression/zlib/zlib.factor
+++ b/basis/compression/zlib/zlib.factor
@@ -3,7 +3,7 @@
 USING: accessors alien alien.c-types alien.data alien.syntax
 byte-arrays byte-vectors classes.struct combinators
 compression.zlib.ffi continuations destructors fry kernel libc
 USING: accessors alien alien.c-types alien.data alien.syntax
 byte-arrays byte-vectors classes.struct combinators
 compression.zlib.ffi continuations destructors fry kernel libc

-math math.functions math.ranges sequences system ;
+math math.functions ranges sequences system ;

 IN: compression.zlib
 
 ERROR: zlib-failed n string ;
 IN: compression.zlib
 
 ERROR: zlib-failed n string ;

diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor
index 24d09fb8b3d3e150b478fea5060c746d9cb97265..85f433dd788850fa9a7f653ba51312ffd16ebfff 100644 (file)
--- a/basis/cpu/ppc/ppc.factor
+++ b/basis/cpu/ppc/ppc.factor
@@ -6,7 +6,7 @@ compiler.cfg compiler.cfg.build-stack-frame compiler.cfg.comparisons
 compiler.cfg.instructions compiler.cfg.intrinsics compiler.cfg.registers
 compiler.cfg.stack-frame compiler.codegen compiler.codegen.fixup
 compiler.constants compiler.units cpu.architecture cpu.ppc.assembler fry io
 compiler.cfg.instructions compiler.cfg.intrinsics compiler.cfg.registers
 compiler.cfg.stack-frame compiler.codegen compiler.codegen.fixup
 compiler.constants compiler.units cpu.architecture cpu.ppc.assembler fry io

-kernel layouts literals locals make math math.order math.ranges memory
+kernel layouts literals locals make math math.order ranges memory

 namespaces prettyprint sequences system vm words ;
 QUALIFIED-WITH: alien.c-types c
 FROM: cpu.ppc.assembler => B ;
 namespaces prettyprint sequences system vm words ;
 QUALIFIED-WITH: alien.c-types c
 FROM: cpu.ppc.assembler => B ;

diff --git a/basis/db/tuples/tuples-tests.factor b/basis/db/tuples/tuples-tests.factor
index b1b245b42a91df51f7bb5977cc38b2f40a80db85..ae01c13f74f8afa76f282777860ba4d920aa13fd 100644 (file)
--- a/basis/db/tuples/tuples-tests.factor
+++ b/basis/db/tuples/tuples-tests.factor
@@ -2,7 +2,7 @@
 ! Copyright (C) 2018 Alexander Ilin.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar calendar.parser classes continuations
 ! Copyright (C) 2018 Alexander Ilin.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar calendar.parser classes continuations

-db.tester db.tuples db.types kernel math math.intervals math.ranges
+db.tester db.tuples db.types kernel math math.intervals ranges

 namespaces random sequences sorting strings tools.test urls ;
 IN: db.tuples.tests
 
 namespaces random sequences sorting strings tools.test urls ;
 IN: db.tuples.tests
 

diff --git a/basis/documents/documents.factor b/basis/documents/documents.factor
index 4f27a03d7e14dc871c86868a02a1e56ae1a8306a..4b6aa3ee53034e332bed028ee834f9ef2ae3af36 100644 (file)
--- a/basis/documents/documents.factor
+++ b/basis/documents/documents.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2009 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2006, 2009 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors arrays kernel math math.order math.ranges
+USING: accessors arrays kernel math math.order ranges

 models sequences splitting ;
 IN: documents
 
 models sequences splitting ;
 IN: documents
 

diff --git a/basis/endian/endian.factor b/basis/endian/endian.factor
index 2c27cad62ce7c91af87e97a33d6868619bfac519..7038f9c54882a6f3f29c5cdf1ce1ad28cde46917 100644 (file)
--- a/basis/endian/endian.factor
+++ b/basis/endian/endian.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types alien.data byte-arrays combinators
 combinators.smart grouping hints kernel math math.bitwise
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types alien.data byte-arrays combinators
 combinators.smart grouping hints kernel math math.bitwise

-math.ranges namespaces sequences sequences.generalizations ;
+ranges namespaces sequences sequences.generalizations ;

 IN: endian
 
 SINGLETONS: big-endian little-endian ;
 IN: endian
 
 SINGLETONS: big-endian little-endian ;

diff --git a/basis/escape-strings/escape-strings.factor b/basis/escape-strings/escape-strings.factor
index eb0b1d4490096bbb8df44ea3f583cd7fd0d5fa60..4c0f4b762eb815f957d9041c19085ede5977d2eb 100644 (file)
--- a/basis/escape-strings/escape-strings.factor
+++ b/basis/escape-strings/escape-strings.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2017 John Benediktsson, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ascii assocs checksums checksums.sha combinators fry
 ! Copyright (C) 2017 John Benediktsson, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ascii assocs checksums checksums.sha combinators fry

-kernel math math.functions math.parser math.ranges
+kernel math math.functions math.parser ranges

 math.statistics sequences sets sorting splitting strings uuid ;
 IN: escape-strings
 
 math.statistics sequences sets sorting splitting strings uuid ;
 IN: escape-strings
 

diff --git a/basis/fixups/fixups.factor b/basis/fixups/fixups.factor
index 208e2a284f2cd628cd34990e8a811518ed7f04f5..7cb2ca79a3aac57377318a6fde2bee25af71486c 100644 (file)
--- a/basis/fixups/fixups.factor
+++ b/basis/fixups/fixups.factor
@@ -18,14 +18,14 @@ CONSTANT: word-renames {
     { "string-lines" { "splitting:split-lines" "0.99" } }
     { "[-inf,a)" { "math.intervals:[-inf,b)" "0.99" } }
     { "[-inf,a]" { "math.intervals:[-inf,b]" "0.99" } }
     { "string-lines" { "splitting:split-lines" "0.99" } }
     { "[-inf,a)" { "math.intervals:[-inf,b)" "0.99" } }
     { "[-inf,a]" { "math.intervals:[-inf,b]" "0.99" } }

-    { "(a,b)" { "math.ranges:(a..b)" "0.99" } }
-    { "(a,b]" { "math.ranges:(a..b]" "0.99" } }
-    { "[a,b)" { "math.ranges:[a..b)" "0.99" } }
-    { "[a,b]" { "math.ranges:[a..b]" "0.99" } }
-    { "[0,b)" { "math.ranges:[0..b)" "0.99" } }
-    { "[0,b]" { "math.ranges:[0..b]" "0.99" } }
-    { "[1,b)" { "math.ranges:[1..b)" "0.99" } }
-    { "[1,b]" { "math.ranges:[1..b]" "0.99" } }
+    { "(a,b)" { "ranges:(a..b)" "0.99" } }
+    { "(a,b]" { "ranges:(a..b]" "0.99" } }
+    { "[a,b)" { "ranges:[a..b)" "0.99" } }
+    { "[a,b]" { "ranges:[a..b]" "0.99" } }
+    { "[0,b)" { "ranges:[0..b)" "0.99" } }
+    { "[0,b]" { "ranges:[0..b]" "0.99" } }
+    { "[1,b)" { "ranges:[1..b)" "0.99" } }
+    { "[1,b]" { "ranges:[1..b]" "0.99" } }

     { "assoc-merge" { "assocs.extras:assoc-collect" "0.99" } }
     { "assoc-merge!" { "assocs.extras:assoc-collect!" "0.99" } }
     { "peek-from" { "modern.html:peek1-from" "0.99" } }
     { "assoc-merge" { "assocs.extras:assoc-collect" "0.99" } }
     { "assoc-merge!" { "assocs.extras:assoc-collect!" "0.99" } }
     { "peek-from" { "modern.html:peek1-from" "0.99" } }

diff --git a/basis/html/templates/chloe/chloe-docs.factor b/basis/html/templates/chloe/chloe-docs.factor
index 94b0a9c7d15da7d983c498900bda479fdc39cb3b..02c9767b9d5c1d249abf0379f4cc70bece8de070 100644 (file)
--- a/basis/html/templates/chloe/chloe-docs.factor
+++ b/basis/html/templates/chloe/chloe-docs.factor
@@ -230,7 +230,7 @@ ARTICLE: "html.templates.chloe.extend.tags.example" "Examples of custom Chloe ta
 $nl
 "Here is the " { $link POSTPONE: USING: } " form that we need for the below code to work:"
 { $code
 $nl
 "Here is the " { $link POSTPONE: USING: } " form that we need for the below code to work:"
 { $code

-    "USING: combinators kernel math.parser math.ranges random"
+    "USING: combinators kernel math.parser ranges random"

     "html.templates.chloe.compiler html.templates.chloe.syntax ;"
 }
 "We write a word which extracts the relevant attributes from an XML tag:"
     "html.templates.chloe.compiler html.templates.chloe.syntax ;"
 }
 "We write a word which extracts the relevant attributes from an XML tag:"

diff --git a/basis/images/processing/processing.factor b/basis/images/processing/processing.factor
index cebb6ec522e2536a7ab47d6ae17d79e21605b82c..24006e2699f320a07703fa943f0afdfc13faa8a7 100644 (file)
--- a/basis/images/processing/processing.factor
+++ b/basis/images/processing/processing.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays byte-arrays combinators grouping images
 kernel locals math math.order
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays byte-arrays combinators grouping images
 kernel locals math math.order

-math.ranges math.vectors sequences sequences.deep fry ;
+ranges math.vectors sequences sequences.deep fry ;

 IN: images.processing
 
 : coord-matrix ( dim -- m )
 IN: images.processing
 
 : coord-matrix ( dim -- m )

diff --git a/basis/images/tessellation/tessellation-tests.factor b/basis/images/tessellation/tessellation-tests.factor
index 211f5893eec6191098c3aae9e85af8e1cc61cd06..15d5060b30c68002fc79b322efa2830281ca5100 100644 (file)
--- a/basis/images/tessellation/tessellation-tests.factor
+++ b/basis/images/tessellation/tessellation-tests.factor
@@ -1,4 +1,4 @@
-USING: images accessors kernel tools.test literals math.ranges
+USING: images accessors kernel tools.test literals ranges

 byte-arrays ;
 IN: images.tessellation
 
 byte-arrays ;
 IN: images.tessellation
 

diff --git a/basis/logging/server/server.factor b/basis/logging/server/server.factor
index 3f133e32fb88645cf68a4ed27d50985688909aea..5cfae1ab202555dd041a0cb77866328c625403c1 100644 (file)
--- a/basis/logging/server/server.factor
+++ b/basis/logging/server/server.factor
@@ -3,7 +3,7 @@
 USING: assocs calendar calendar.format combinators
 concurrency.messaging continuations debugger destructors init io
 io.directories io.encodings.utf8 io.files io.pathnames kernel
 USING: assocs calendar calendar.format combinators
 concurrency.messaging continuations debugger destructors init io
 io.directories io.encodings.utf8 io.files io.pathnames kernel

-locals math math.parser math.ranges namespaces sequences
+locals math math.parser ranges namespaces sequences

 strings threads ;
 IN: logging.server
 
 strings threads ;
 IN: logging.server
 

diff --git a/basis/math/combinatorics/combinatorics.factor b/basis/math/combinatorics/combinatorics.factor
index 09a3cd3fad645becf1f6bb26ed041030d688c10d..72fda6cf397194266407eb452ac2448c252bfb52 100644 (file)
--- a/basis/math/combinatorics/combinatorics.factor
+++ b/basis/math/combinatorics/combinatorics.factor
@@ -3,7 +3,7 @@
 
 USING: accessors arrays assocs classes.tuple combinators hints
 kernel kernel.private make math math.functions math.order
 
 USING: accessors arrays assocs classes.tuple combinators hints
 kernel kernel.private make math math.functions math.order

-math.ranges sequences sequences.private sorting strings vectors ;
+ranges sequences sequences.private sorting strings vectors ;

 IN: math.combinatorics
 
 <PRIVATE
 IN: math.combinatorics
 
 <PRIVATE

diff --git a/basis/math/functions/functions-tests.factor b/basis/math/functions/functions-tests.factor
index 583549783caf613daf691d7274af83fd1a5067b5..dcba10e60968b8f46f1cc9fa829da8473b6f5987 100644 (file)
--- a/basis/math/functions/functions-tests.factor
+++ b/basis/math/functions/functions-tests.factor
@@ -1,5 +1,5 @@
 USING: kernel literals math math.constants math.functions math.libm
 USING: kernel literals math math.constants math.functions math.libm

-math.order math.ranges math.private sequences tools.test math.floats.env ;
+math.order ranges math.private sequences tools.test math.floats.env ;

 
 IN: math.functions.tests
 
 
 IN: math.functions.tests
 

diff --git a/basis/math/matrices/matrices.factor b/basis/math/matrices/matrices.factor
index edc8d38c03273b2706071eeea317e8396ddf34e8..f777eae9d98fd67fe34c040a743495223ecc827e 100644 (file)
--- a/basis/math/matrices/matrices.factor
+++ b/basis/math/matrices/matrices.factor
@@ -3,7 +3,7 @@
 USING: accessors arrays classes.singleton columns combinators
 combinators.short-circuit combinators.smart formatting fry
 grouping kernel locals math math.bits math.functions math.order
 USING: accessors arrays classes.singleton columns combinators
 combinators.short-circuit combinators.smart formatting fry
 grouping kernel locals math math.bits math.functions math.order

-math.private math.ranges math.statistics math.vectors
+math.private ranges math.statistics math.vectors

 math.vectors.private sequences sequences.deep sequences.private
 slots.private summary ;
 IN: math.matrices
 math.vectors.private sequences sequences.deep sequences.private
 slots.private summary ;
 IN: math.matrices

diff --git a/basis/math/primes/erato/erato-tests.factor b/basis/math/primes/erato/erato-tests.factor
index c68b35b655d6e14977b7ed88674813c5b93f4847..7bcb936b18058682273d69ebbe701014dec14957 100644 (file)
--- a/basis/math/primes/erato/erato-tests.factor
+++ b/basis/math/primes/erato/erato-tests.factor
@@ -1,5 +1,5 @@
 USING: fry kernel math math.bitwise math.primes.erato
 USING: fry kernel math math.bitwise math.primes.erato

-math.ranges sequences tools.test ;
+ranges sequences tools.test ;

 
 { B{ 255 251 247 126 } } [ 100 sieve ] unit-test
 [ 1 100 sieve marked-prime? ] [ bounds-error? ] must-fail-with
 
 { B{ 255 251 247 126 } } [ 100 sieve ] unit-test
 [ 1 100 sieve marked-prime? ] [ bounds-error? ] must-fail-with

diff --git a/basis/math/primes/erato/erato.factor b/basis/math/primes/erato/erato.factor
index 66e7272d0f666324b1e5154a2a517419f3304a4c..665ca63b39960288460598962fc8d4bb29f2e33b 100644 (file)
--- a/basis/math/primes/erato/erato.factor
+++ b/basis/math/primes/erato/erato.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel kernel.private locals math math.bitwise
 ! Copyright (C) 2009 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel kernel.private locals math math.bitwise

-math.functions math.order math.private math.ranges sequences
+math.functions math.order math.private ranges sequences

 sequences.private ;
 IN: math.primes.erato
 
 sequences.private ;
 IN: math.primes.erato
 

diff --git a/basis/math/primes/erato/fast/fast.factor b/basis/math/primes/erato/fast/fast.factor
index bd30ebaa786c2f876e17cace71b81e360a6c577e..d6a18895316bacc8e8579d0fe02c9e0740456092 100644 (file)
--- a/basis/math/primes/erato/fast/fast.factor
+++ b/basis/math/primes/erato/fast/fast.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: bit-arrays fry kernel kernel.private literals locals math
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: bit-arrays fry kernel kernel.private literals locals math

-math.functions math.private math.ranges math.statistics
+math.functions math.private ranges math.statistics

 sequences sequences.private ;
 
 IN: math.primes.erato.fast
 sequences sequences.private ;
 
 IN: math.primes.erato.fast

diff --git a/basis/math/primes/factors/factors.factor b/basis/math/primes/factors/factors.factor
index a3f3dbcbc173f24b0b50b9341ea9f7003a01c851..21acd00641682422941f5b4436e6c17b0bb4f279 100644 (file)
--- a/basis/math/primes/factors/factors.factor
+++ b/basis/math/primes/factors/factors.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays combinators command-line io kernel math
 math.functions math.parser math.primes.pollard-rho-brent
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays combinators command-line io kernel math
 math.functions math.parser math.primes.pollard-rho-brent

-math.ranges math.statistics namespaces sequences
+ranges math.statistics namespaces sequences

 sequences.product sets sorting splitting ;
 IN: math.primes.factors
 
 sequences.product sets sorting splitting ;
 IN: math.primes.factors
 

diff --git a/basis/math/primes/miller-rabin/miller-rabin.factor b/basis/math/primes/miller-rabin/miller-rabin.factor
index 0e21cf3222a1bdd755a6a2a6ded3967d4e2f72e2..ef15af5d5c389ea6127c3bc74ce1d3af67e6c430 100644 (file)
--- a/basis/math/primes/miller-rabin/miller-rabin.factor
+++ b/basis/math/primes/miller-rabin/miller-rabin.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008-2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008-2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: combinators kernel locals math math.functions math.ranges
+USING: combinators kernel locals math math.functions ranges

 random sequences ;
 IN: math.primes.miller-rabin
 
 random sequences ;
 IN: math.primes.miller-rabin
 

diff --git a/basis/math/primes/pollard-rho-brent/pollard-rho-brent.factor b/basis/math/primes/pollard-rho-brent/pollard-rho-brent.factor
index 66f32e0388372afcf0a1c627753119e2113822f0..2a038c8cde57b7bb25a27b4b2373110f5a3c3b68 100644 (file)
--- a/basis/math/primes/pollard-rho-brent/pollard-rho-brent.factor
+++ b/basis/math/primes/pollard-rho-brent/pollard-rho-brent.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2021 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel make math math.order math.primes
 ! Copyright (C) 2021 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel make math math.order math.primes

-math.ranges random sorting ;
+ranges random sorting ;

 IN: math.primes.pollard-rho-brent
 
 ! https://comeoncodeon.wordpress.com/2010/09/18/pollard-rho-brent-integer-factorization/
 IN: math.primes.pollard-rho-brent
 
 ! https://comeoncodeon.wordpress.com/2010/09/18/pollard-rho-brent-integer-factorization/

diff --git a/basis/math/primes/primes.factor b/basis/math/primes/primes.factor
index 543be5bbdb38ca703f5502f7a7964b7395345926..a83e6800e53926bc680e5058262137869d2f6309 100644 (file)
--- a/basis/math/primes/primes.factor
+++ b/basis/math/primes/primes.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators combinators.short-circuit fry kernel locals
 math math.bitwise math.functions math.order math.primes.erato
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators combinators.short-circuit fry kernel locals
 math math.bitwise math.functions math.order math.primes.erato

-math.primes.erato.private math.primes.miller-rabin math.ranges
+math.primes.erato.private math.primes.miller-rabin ranges

 literals random sequences sets vectors ;
 IN: math.primes
 
 literals random sequences sets vectors ;
 IN: math.primes
 

diff --git a/basis/math/statistics/statistics-tests.factor b/basis/math/statistics/statistics-tests.factor
index 3a31d83db3493a0e2690c41b4765ebd0ad4e2514..0166d577e316569cc6067ad998cd9864509aad8c 100644 (file)
--- a/basis/math/statistics/statistics-tests.factor
+++ b/basis/math/statistics/statistics-tests.factor
@@ -1,4 +1,4 @@
-USING: arrays kernel math math.functions math.order math.ranges
+USING: arrays kernel math math.functions math.order ranges

 math.vectors sequences tools.test ;
 IN: math.statistics
 
 math.vectors sequences tools.test ;
 IN: math.statistics
 

diff --git a/basis/math/statistics/statistics.factor b/basis/math/statistics/statistics.factor
index 37a05ee5788c00c3c06ebe8796f4615bd1bbb806..8be9dae79b86c1e74d0d85c76f583297d06f1e78 100644 (file)
--- a/basis/math/statistics/statistics.factor
+++ b/basis/math/statistics/statistics.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators
 combinators.short-circuit fry generalizations grouping kernel
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators
 combinators.short-circuit fry generalizations grouping kernel

-locals math math.functions math.order math.ranges math.vectors
+locals math math.functions math.order ranges math.vectors

 sequences sequences.private sorting ;
 IN: math.statistics
 
 sequences sequences.private sorting ;
 IN: math.statistics
 


@@ -24,7 +24,7 @@ GENERIC: sum-of-squares ( seq -- x )
 M: object sum-of-squares [ sq ] map-sum ;
 M: iota sum-of-squares
     n>> 1 - [ ] [ 1 + ] [ 1/2 + ] tri * * 3 / ;
 M: object sum-of-squares [ sq ] map-sum ;
 M: iota sum-of-squares
     n>> 1 - [ ] [ 1 + ] [ 1/2 + ] tri * * 3 / ;

-M: math.ranges:range sum-of-squares
+M: ranges:range sum-of-squares

     dup { [ step>> 1 = ] [ from>> integer? ] } 1&& [
         [ from>> ] [ length>> ] bi dupd +
         [ <iota> sum-of-squares ] bi@ swap -
     dup { [ step>> 1 = ] [ from>> integer? ] } 1&& [
         [ from>> ] [ length>> ] bi dupd +
         [ <iota> sum-of-squares ] bi@ swap -


@@ -33,7 +33,7 @@ M: math.ranges:range sum-of-squares
 GENERIC: sum-of-cubes ( seq -- x )
 M: object sum-of-cubes [ 3 ^ ] map-sum ;
 M: iota sum-of-cubes sum sq ;
 GENERIC: sum-of-cubes ( seq -- x )
 M: object sum-of-cubes [ 3 ^ ] map-sum ;
 M: iota sum-of-cubes sum sq ;

-M: math.ranges:range sum-of-cubes
+M: ranges:range sum-of-cubes

     dup { [ step>> 1 = ] [ from>> integer? ] } 1&& [
         [ from>> ] [ length>> ] bi dupd +
         [ <iota> sum-of-cubes ] bi@ swap -
     dup { [ step>> 1 = ] [ from>> integer? ] } 1&& [
         [ from>> ] [ length>> ] bi dupd +
         [ <iota> sum-of-cubes ] bi@ swap -


@@ -51,7 +51,7 @@ M: iota sum-of-quads
             * * * 30 /
         ] [ 0 ] if
     ] ;
             * * * 30 /
         ] [ 0 ] if
     ] ;

-M: math.ranges:range sum-of-quads
+M: ranges:range sum-of-quads

     dup { [ step>> 1 = ] [ from>> integer? ] } 1&& [
         [ from>> ] [ length>> ] bi dupd +
         [ <iota> sum-of-quads ] bi@ swap -
     dup { [ step>> 1 = ] [ from>> integer? ] } 1&& [
         [ from>> ] [ length>> ] bi dupd +
         [ <iota> sum-of-quads ] bi@ swap -

diff --git a/basis/math/vectors/simd/intrinsics/intrinsics.factor b/basis/math/vectors/simd/intrinsics/intrinsics.factor
index ba5693c48072e37e81d2f00ea026369fa8b6fe53..459b7dc8eb9429c9a804dc71364c4a8781d8955e 100644 (file)
--- a/basis/math/vectors/simd/intrinsics/intrinsics.factor
+++ b/basis/math/vectors/simd/intrinsics/intrinsics.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.data combinators cpu.architecture fry
 ! Copyright (C) 2009 Slava Pestov, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.data combinators cpu.architecture fry

-grouping kernel libc locals math math.libm math.order math.ranges
+grouping kernel libc locals math math.libm math.order ranges

 sequences sequences.cords sequences.generalizations sequences.private
 sequences.unrolled sequences.unrolled.private specialized-arrays
 vocabs ;
 sequences sequences.cords sequences.generalizations sequences.private
 sequences.unrolled sequences.unrolled.private specialized-arrays
 vocabs ;

diff --git a/basis/math/vectors/simd/simd-tests.factor b/basis/math/vectors/simd/simd-tests.factor
index c137e372037679c406561d60d6ac54fb56d38d74..bbd972ea71c4bb45ad0b6c4962c40cc7cd3727be 100644 (file)
--- a/basis/math/vectors/simd/simd-tests.factor
+++ b/basis/math/vectors/simd/simd-tests.factor
@@ -1,6 +1,6 @@
 USING: accessors arrays classes compiler.test compiler.tree.debugger
 effects fry io kernel kernel.private math math.functions
 USING: accessors arrays classes compiler.test compiler.tree.debugger
 effects fry io kernel kernel.private math math.functions

-math.private math.vectors math.vectors.simd math.ranges
+math.private math.vectors math.vectors.simd ranges

 math.vectors.simd.private prettyprint random sequences system
 tools.test vocabs assocs compiler.cfg.debugger words
 locals combinators cpu.architecture namespaces byte-arrays alien
 math.vectors.simd.private prettyprint random sequences system
 tools.test vocabs assocs compiler.cfg.debugger words
 locals combinators cpu.architecture namespaces byte-arrays alien

diff --git a/basis/mime/multipart/multipart-tests.factor b/basis/mime/multipart/multipart-tests.factor
index 2bf79e9b8e9b0895a2593e2e5f366d797fc8062d..78a77f95f34641cae4b6571f8cdb821bd33dde5c 100644 (file)
--- a/basis/mime/multipart/multipart-tests.factor
+++ b/basis/mime/multipart/multipart-tests.factor
@@ -3,7 +3,7 @@
 USING: accessors assocs continuations fry http.server io
 io.encodings.ascii io.files io.files.temp io.files.unique
 io.servers io.streams.duplex io.streams.string
 USING: accessors assocs continuations fry http.server io
 io.encodings.ascii io.files io.files.temp io.files.unique
 io.servers io.streams.duplex io.streams.string

-kernel math.ranges mime.multipart multiline namespaces random
+kernel ranges mime.multipart multiline namespaces random

 sequences sorting strings threads tools.test ;
 IN: mime.multipart.tests
 
 sequences sorting strings threads tools.test ;
 IN: mime.multipart.tests
 

diff --git a/basis/peg/parsers/parsers.factor b/basis/peg/parsers/parsers.factor
index 861f613ee425dbcf95c109d67c4335eda48cedc3..7543113d51d93c9e922c86420fa8363210e66e9b 100644 (file)
--- a/basis/peg/parsers/parsers.factor
+++ b/basis/peg/parsers/parsers.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Chris Double, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors fry kernel literals make math math.parser
 ! Copyright (C) 2007, 2008 Chris Double, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors fry kernel literals make math math.parser

-math.ranges peg peg.private sequences splitting strings unicode
+ranges peg peg.private sequences splitting strings unicode

 vectors ;
 FROM: peg.search => replace ;
 IN: peg.parsers
 vectors ;
 FROM: peg.search => replace ;
 IN: peg.parsers

diff --git a/basis/persistent/hashtables/hashtables-tests.factor b/basis/persistent/hashtables/hashtables-tests.factor
index 3f42003e89c46506cf963d62bf5dd58c8c7490bc..c9ffab5e6cd6f43055d62c1d9ce06d9b069b4faa 100644 (file)
--- a/basis/persistent/hashtables/hashtables-tests.factor
+++ b/basis/persistent/hashtables/hashtables-tests.factor
@@ -1,6 +1,6 @@
 IN: persistent.hashtables.tests
 USING: persistent.hashtables persistent.assocs hashtables assocs
 IN: persistent.hashtables.tests
 USING: persistent.hashtables persistent.assocs hashtables assocs

-tools.test kernel locals namespaces random math.ranges sequences fry ;
+tools.test kernel locals namespaces random ranges sequences fry ;

 
 { t } [ PH{ } assoc-empty? ] unit-test
 
 
 { t } [ PH{ } assoc-empty? ] unit-test
 

diff --git a/basis/random/passwords/passwords.factor b/basis/random/passwords/passwords.factor
index 61cc31c1881c0cbf9006cc71eaa8386236419e3f..93b68577fd9ea4e18cd15441c3848de28f419458 100644 (file)
--- a/basis/random/passwords/passwords.factor
+++ b/basis/random/passwords/passwords.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2019 Alexander Ilin.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2019 Alexander Ilin.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: fry literals math.ranges random sequences ;
+USING: fry literals ranges random sequences ;

 IN: random.passwords
 
 <PRIVATE
 IN: random.passwords
 
 <PRIVATE

diff --git a/basis/random/random.factor b/basis/random/random.factor
index b71291df92faafc8ff10b117b9baca6e236d9148..4c91bf3af97997e54dfa592ef8d5621c1673ebe0 100644 (file)
--- a/basis/random/random.factor
+++ b/basis/random/random.factor
@@ -4,7 +4,7 @@ USING: accessors alien.data arrays assocs byte-arrays
 byte-vectors combinators combinators.short-circuit endian fry
 hashtables hashtables.private hash-sets hints io.backend kernel
 locals math math.bitwise math.constants math.functions
 byte-vectors combinators combinators.short-circuit endian fry
 hashtables hashtables.private hash-sets hints io.backend kernel
 locals math math.bitwise math.constants math.functions

-math.order math.ranges namespaces sequences sequences.private
+math.order ranges namespaces sequences sequences.private

 sets summary system typed vocabs ;
 QUALIFIED-WITH: alien.c-types c
 QUALIFIED-WITH: sets sets
 sets summary system typed vocabs ;
 QUALIFIED-WITH: alien.c-types c
 QUALIFIED-WITH: sets sets

diff --git a/basis/random/sfmt/sfmt.factor b/basis/random/sfmt/sfmt.factor
index 0720cf1b5133d7f1c523cc4ac527e727662f9059..2ef48334489d2161db73fcdc703974f8efb4c673 100644 (file)
--- a/basis/random/sfmt/sfmt.factor
+++ b/basis/random/sfmt/sfmt.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.data kernel locals math
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.data kernel locals math

-math.ranges math.bitwise math.vectors math.vectors.simd random
+ranges math.bitwise math.vectors math.vectors.simd random

 sequences specialized-arrays sequences.private classes.struct
 combinators.short-circuit fry ;
 SPECIALIZED-ARRAY: uint
 sequences specialized-arrays sequences.private classes.struct
 combinators.short-circuit fry ;
 SPECIALIZED-ARRAY: uint

diff --git a/basis/regexp/regexp.factor b/basis/regexp/regexp.factor
index de033c8abc041191fed81f9a2c544d5380f67480..a421d262652b339f347501b71db2e933c728baa2 100644 (file)
--- a/basis/regexp/regexp.factor
+++ b/basis/regexp/regexp.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays compiler.units kernel kernel.private
 ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays compiler.units kernel kernel.private

-lexer make math math.ranges namespaces regexp.ast
+lexer make math ranges namespaces regexp.ast

 regexp.compiler regexp.negation regexp.parser sequences
 sequences.private splitting strings vocabs.loader words ;
 IN: regexp
 regexp.compiler regexp.negation regexp.parser sequences
 sequences.private splitting strings vocabs.loader words ;
 IN: regexp

diff --git a/basis/retries/retries.factor b/basis/retries/retries.factor
index 1a294abc0ab57718e3e2742eb73819b9be0e91fc..29a069d34f04dff29472fe2aa22dee6bd8a9f5ec 100644 (file)
--- a/basis/retries/retries.factor
+++ b/basis/retries/retries.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2021 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays calendar combinators combinators.smart
 ! Copyright (C) 2021 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays calendar combinators combinators.smart

-continuations kernel math math.functions math.parser math.ranges
+continuations kernel math math.functions math.parser ranges

 namespaces prettyprint random sequences system threads ;
 IN: retries
 
 namespaces prettyprint random sequences system threads ;
 IN: retries
 

diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index 45b7a2735f82939d74081a0db035ba5fa059bdef..7e53ee7fd78398803c434ff548cd96bb7f03d70c 100644 (file)
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -3,7 +3,7 @@
 USING: accessors arrays assocs calendar colors.constants
 combinators combinators.short-circuit documents
 documents.elements fonts fry grouping kernel literals locals
 USING: accessors arrays assocs calendar colors.constants
 combinators combinators.short-circuit documents
 documents.elements fonts fry grouping kernel literals locals

-make math math.functions math.order math.ranges math.rectangles
+make math math.functions math.order ranges math.rectangles

 math.vectors models models.arrow namespaces opengl opengl.gl
 sequences sorting splitting system timers ui.baseline-alignment
 ui.clipboards ui.commands ui.gadgets ui.gadgets.borders
 math.vectors models models.arrow namespaces opengl opengl.gl
 sequences sorting splitting system timers ui.baseline-alignment
 ui.clipboards ui.commands ui.gadgets ui.gadgets.borders

diff --git a/basis/ui/gadgets/line-support/line-support.factor b/basis/ui/gadgets/line-support/line-support.factor
index 2febbe3b53502be27f721176e6ea7576d34a5274..7e0c72aec0b790b5917be32b6bf7e6872200ef7d 100644 (file)
--- a/basis/ui/gadgets/line-support/line-support.factor
+++ b/basis/ui/gadgets/line-support/line-support.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays combinators fry kernel math
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays combinators fry kernel math

-math.functions math.order math.ranges math.vectors namespaces
+math.functions math.order ranges math.vectors namespaces

 opengl sequences ui.gadgets ui.gadgets.scrollers
 ui.gadgets.viewports ui.render ui.text ui.theme ;
 IN: ui.gadgets.line-support
 opengl sequences ui.gadgets ui.gadgets.scrollers
 ui.gadgets.viewports ui.render ui.text ui.theme ;
 IN: ui.gadgets.line-support

diff --git a/basis/ui/gadgets/sliders/sliders-docs.factor b/basis/ui/gadgets/sliders/sliders-docs.factor
index b455beae13ef276ac4514591bf05c0693c3b87ab..5adebc6b2b2ee5d0dced5afb4faa25c9642d26ff 100644 (file)
--- a/basis/ui/gadgets/sliders/sliders-docs.factor
+++ b/basis/ui/gadgets/sliders/sliders-docs.factor
@@ -1,4 +1,4 @@
-USING: help.markup help.syntax math math.ranges ui.gadgets
+USING: help.markup help.syntax math ranges ui.gadgets

 ui.gadgets.sliders.private ;
 IN: ui.gadgets.sliders
 
 ui.gadgets.sliders.private ;
 IN: ui.gadgets.sliders
 

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index 555827c084848aa2d161e954c74695b83e9a4ede..cc13236411830d96343bd56bdf02164eced6ee36 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -3,7 +3,7 @@
 USING: arrays ascii assocs byte-arrays combinators
 combinators.short-circuit grouping hashtables interval-sets
 io.encodings.utf8 io.files kernel locals make math math.bitwise
 USING: arrays ascii assocs byte-arrays combinators
 combinators.short-circuit grouping hashtables interval-sets
 io.encodings.utf8 io.files kernel locals make math math.bitwise

-math.order math.parser math.ranges memoize namespaces sequences
+math.order math.parser ranges memoize namespaces sequences

 sets simple-flat-file sorting splitting strings.parser ;
 IN: unicode.data
 
 sets simple-flat-file sorting splitting strings.parser ;
 IN: unicode.data
 

diff --git a/basis/unicode/unicode.factor b/basis/unicode/unicode.factor
index f20f777bebf584be2b1a7691e52dc4c88d3e10c9..0a08bc787cc155071d992b10920b7e9c7a9b0662 100644 (file)
--- a/basis/unicode/unicode.factor
+++ b/basis/unicode/unicode.factor
@@ -3,7 +3,7 @@ hints interval-maps kernel math math.order sequences sorting
 strings unicode.breaks.private unicode.case.private
 unicode.categories unicode.collation unicode.collation.private
 unicode.data unicode.data.private unicode.normalize.private
 strings unicode.breaks.private unicode.case.private
 unicode.categories unicode.collation unicode.collation.private
 unicode.data unicode.data.private unicode.normalize.private

-unicode.script locals math.ranges ;
+unicode.script locals ranges ;

 IN: unicode
 
 CATEGORY: blank Zs Zl Zp | "\r\n\t" member? ;
 IN: unicode
 
 CATEGORY: blank Zs Zl Zp | "\r\n\t" member? ;

diff --git a/basis/uuid/uuid.factor b/basis/uuid/uuid.factor
index cb72219a797e2981cf9dbd536822aa6641e64d92..818219192e82379709d649681602bc0a5bfed16f 100644 (file)
--- a/basis/uuid/uuid.factor
+++ b/basis/uuid/uuid.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 USING: byte-arrays calendar checksums checksums.md5
 ! Copyright (C) 2008 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 USING: byte-arrays calendar checksums checksums.md5

-checksums.sha endian kernel math math.parser math.ranges
+checksums.sha endian kernel math math.parser ranges

 random sequences strings system unicode ;
 IN: uuid
 
 random sequences strings system unicode ;
 IN: uuid
 

diff --git a/basis/validators/validators.factor b/basis/validators/validators.factor
index b9587161fd74c1f6a0b0f044175a8b333b888464..77350003672f1a41f44c2d18945de3660b08beab 100644 (file)
--- a/basis/validators/validators.factor
+++ b/basis/validators/validators.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2010 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays assocs classes continuations hashtables kernel
 ! Copyright (C) 2006, 2010 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays assocs classes continuations hashtables kernel

-make math math.functions math.parser math.ranges namespaces
+make math math.functions math.parser ranges namespaces

 quotations regexp sequences sets unicode words xmode.catalog ;
 IN: validators
 
 quotations regexp sequences sets unicode words xmode.catalog ;
 IN: validators
 

diff --git a/basis/windows/user32/user32.factor b/basis/windows/user32/user32.factor
index 641c1f06caa742d6fdad8123dba02a447d60e5d5..1ec9a738d961d0bd6e442e1dc7d359487def99d0 100644 (file)
--- a/basis/windows/user32/user32.factor
+++ b/basis/windows/user32/user32.factor
@@ -2366,7 +2366,7 @@ FUNCTION: BOOL IsValidDpiAwarenessContext (
 )
 
 ! DPI_AWARENESS_CONTEXT experimentally:
 )
 
 ! DPI_AWARENESS_CONTEXT experimentally:

-! USE: math.ranges -100 1000 [a..b] [ <alien> IsValidDpiAwarenessContext ] zip-with
+! USE: ranges -100 1000 [a..b] [ <alien> IsValidDpiAwarenessContext ] zip-with

 ! [ nip 0 > ] assoc-filter keys .
 ! { -5 -4 -3 -2 -1 17 18 34 273 529 785 }
 
 ! [ nip 0 > ] assoc-filter keys .
 ! { -5 -4 -3 -2 -1 17 18 34 273 529 785 }
 

diff --git a/core/generalizations/generalizations.factor b/core/generalizations/generalizations.factor
index 9b0f70f710589bf5b8576bd729dbe577eab23653..b45e61ce6812efb9742b9ab61f9e893fc6b25a15 100644 (file)
--- a/core/generalizations/generalizations.factor
+++ b/core/generalizations/generalizations.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2009 Chris Double, Doug Coleman, Eduardo
 ! Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007, 2009 Chris Double, Doug Coleman, Eduardo
 ! Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays combinators kernel kernel.private math math.ranges
+USING: arrays combinators kernel kernel.private math ranges

 memoize.private sequences ;
 IN: generalizations
 
 memoize.private sequences ;
 IN: generalizations
 

diff --git a/core/math/ranges/authors.txt b/core/math/ranges/authors.txt
deleted file mode 100644 (file)
index f372b57..0000000
--- a/core/math/ranges/authors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Slava Pestov
-Doug Coleman

diff --git a/core/math/ranges/ranges-docs.factor b/core/math/ranges/ranges-docs.factor
deleted file mode 100644 (file)
index 15ef334..0000000
--- a/core/math/ranges/ranges-docs.factor
+++ /dev/null
@@ -1,28 +0,0 @@
-USING: help.syntax help.markup arrays sequences ;
-IN: math.ranges
-
-ARTICLE: "math.ranges" "Numeric ranges"
-"A " { $emphasis "range" } " is a virtual sequence with real number elements "
-"ranging from " { $emphasis "a" } " to " { $emphasis "b" } " by " { $emphasis "step" } ". Ascending as well as descending ranges are supported."
-$nl
-"The class of ranges:"
-{ $subsections range }
-"Creating ranges with integer end-points. The standard mathematical convention is used, where " { $snippet "(" } " or " { $snippet ")" } " denotes that the end-point itself " { $emphasis "is not" } " part of the range; " { $snippet "[" } " or " { $snippet "]" } " denotes that the end-point " { $emphasis "is" } " part of the range:"
-{ $subsections
-    [a..b]
-    (a..b]
-    [a..b)
-    (a..b)
-    [0..b]
-    [1..b]
-    [0..b)
-}
-"Creating general ranges:"
-{ $subsections <range> }
-"Ranges are most frequently used with sequence combinators as a means of iterating over integers. For example,"
-{ $code "3 10 [a..b] [ sqrt ] map" }
-"Computing the factorial of 100 with a descending range:"
-{ $code "100 1 [a..b] product" }
-"A range can be converted into a concrete sequence using a word such as " { $link >array } ". In most cases this is unnecessary since ranges implement the sequence protocol already. It is necessary if a mutable sequence is needed, for use with words such as " { $link set-nth } " or " { $link map! } "." ;
-
-ABOUT: "math.ranges"

diff --git a/core/math/ranges/ranges-tests.factor b/core/math/ranges/ranges-tests.factor
deleted file mode 100644 (file)
index 1287ea1..0000000
--- a/core/math/ranges/ranges-tests.factor
+++ /dev/null
@@ -1,57 +0,0 @@
-USING: arrays kernel math math.ranges sequences sets tools.test ;
-
-{ { } } [ 1 1 (a..b) >array ] unit-test
-{ { } } [ 1 1 (a..b] >array ] unit-test
-{ { } } [ 1 1 [a..b) >array ] unit-test
-{ { 1 } } [ 1 1 [a..b] >array ] unit-test
-
-{ { }  } [ 1 2 (a..b) >array ] unit-test
-{ { 2 } } [ 1 2 (a..b] >array ] unit-test
-{ { 1 } } [ 1 2 [a..b) >array ] unit-test
-{ { 1 2 } } [ 1 2 [a..b] >array ] unit-test
-
-{ { } } [ 2 1 (a..b) >array ] unit-test
-{ { 1 } } [ 2 1 (a..b] >array ] unit-test
-{ { 2 } } [ 2 1 [a..b) >array ] unit-test
-{ { 2 1 } } [ 2 1 [a..b] >array ] unit-test
-
-{ { 1 2 3 4 5 } } [ 1 5 1 <range> >array ] unit-test
-{ { 5 4 3 2 1 } } [ 5 1 -1 <range> >array ] unit-test
-
-{ { 0 1/3 2/3 1 } } [ 0 1 1/3 <range> >array ] unit-test
-{ { 0 1/3 2/3 1 } } [ 1 0 -1/3 <range> >array reverse ] unit-test
-
-{ 0 } [ 0 -1 .0001 <range> length ] unit-test
-{ 0 } [ 0 -1 .5 <range> length ] unit-test
-{ 0 } [ 0 -1 1 <range> length ] unit-test
-{ 0 } [ 0 -1 2 <range> length ] unit-test
-{ 0 } [ 0 -1 3 <range> length ] unit-test
-{ 0 } [ 0 -1 4 <range> length ] unit-test
-
-{ 0 } [ 0 -2 .0001 <range> length ] unit-test
-{ 0 } [ 0 -2 1 <range> length ] unit-test
-{ 0 } [ 0 -2 2 <range> length ] unit-test
-{ 0 } [ 0 -2 3 <range> length ] unit-test
-{ 0 } [ 0 -2 4 <range> length ] unit-test
-
-{ 0 } [ -1 0 -.0001 <range> length ] unit-test
-{ 0 } [ -1 0 -.5 <range> length ] unit-test
-{ 0 } [ -1 0 -1 <range> length ] unit-test
-{ 0 } [ -1 0 -2 <range> length ] unit-test
-{ 0 } [ -1 0 -3 <range> length ] unit-test
-{ 0 } [ -1 0 -4 <range> length ] unit-test
-
-{ 0 } [ -2 0 -.0001 <range> length ] unit-test
-{ 0 } [ -2 0 -1 <range> length ] unit-test
-{ 0 } [ -2 0 -2 <range> length ] unit-test
-{ 0 } [ -2 0 -3 <range> length ] unit-test
-{ 0 } [ -2 0 -4 <range> length ] unit-test
-
-{ 100 } [
-    1 100 [a..b] [ 2^ [1..b] ] map members length
-] unit-test
-
-{ t } [ -10 10 1 <range> [ sum ] [ >array sum ] bi = ] unit-test
-{ t } [ -10 10 2 <range> [ sum ] [ >array sum ] bi = ] unit-test
-{ t } [ 10 -10 -1 <range> [ sum ] [ >array sum ] bi = ] unit-test
-{ t } [ 10 -10 -2 <range> [ sum ] [ >array sum ] bi = ] unit-test

diff --git a/core/math/ranges/ranges.factor b/core/math/ranges/ranges.factor
deleted file mode 100644 (file)
index f834ea6..0000000
--- a/core/math/ranges/ranges.factor
+++ /dev/null
@@ -1,71 +0,0 @@
-! Copyright (C) 2008, 2010 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors classes.tuple kernel math math.order sequences
-sequences.private ;
-IN: math.ranges
-
-TUPLE: range
-{ from read-only }
-{ length read-only }
-{ step read-only } ;
-
-<PRIVATE
-
-: sign/mod ( x y -- z w )
-    [ [ /i ] 2keep pick * - ] keep 0 < [ neg ] when ; inline
-
-PRIVATE>
-
-: <range> ( a b step -- range )
-    [ over - ] dip
-    [ sign/mod 0 < [ 1 + ] unless 0 max ] keep
-    range boa ; inline
-
-M: range length length>> ; inline
-
-M: range nth-unsafe
-    [ step>> * ] keep from>> + ; inline
-
-! We want M\ tuple hashcode, not M\ sequence hashcode here!
-! sequences hashcode is O(n) in number of elements
-M: range hashcode* tuple-hashcode ;
-
-INSTANCE: range immutable-sequence
-
-M: range sum [ length ] [ first ] [ last ] tri + * 2 / ;
-
-<PRIVATE
-
-: twiddle ( a b -- a b step ) 2dup > -1 1 ? ; inline
-
-: (a.. ( a b step -- a' b' step ) dup [ + ] curry 2dip ; inline
-
-: ..b) ( a b step -- a' b' step ) dup [ - ] curry dip ; inline
-
-PRIVATE>
-
-: [a..b] ( a b -- range ) twiddle <range> ; inline
-
-: (a..b] ( a b -- range ) twiddle (a.. <range> ; inline
-
-: [a..b) ( a b -- range ) twiddle ..b) <range> ; inline
-
-: (a..b) ( a b -- range ) twiddle (a.. ..b) <range> ; inline
-
-: [0..b] ( b -- range ) 0 swap [a..b] ; inline
-
-: [1..b] ( b -- range ) 1 swap [a..b] ; inline
-
-: [0..b) ( b -- range ) 0 swap [a..b) ; inline
-
-: [1..b) ( b -- range ) 1 swap [a..b) ; inline
-
-! backwards compatibility for new syntax
-ALIAS: [a,b] [a..b] deprecated
-ALIAS: (a,b] (a..b] deprecated
-ALIAS: [a,b) [a..b) deprecated
-ALIAS: (a,b) (a..b) deprecated
-ALIAS: [0,b] [0..b] deprecated
-ALIAS: [1,b] [1..b] deprecated
-ALIAS: [0,b) [0..b) deprecated
-ALIAS: [1,b) [1..b) deprecated

diff --git a/core/math/ranges/summary.txt b/core/math/ranges/summary.txt
deleted file mode 100644 (file)
index 3e5e6b9..0000000
--- a/core/math/ranges/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Virtual sequence consisting of a range of numbers

diff --git a/core/math/ranges/tags.txt b/core/math/ranges/tags.txt
deleted file mode 100644 (file)
index ede10ab..0000000
--- a/core/math/ranges/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-math

diff --git a/core/ranges/authors.txt b/core/ranges/authors.txt
new file mode 100644 (file)
index 0000000..f372b57
--- /dev/null
+++ b/core/ranges/authors.txt
@@ -0,0 +1,2 @@
+Slava Pestov
+Doug Coleman

diff --git a/core/ranges/ranges-docs.factor b/core/ranges/ranges-docs.factor
new file mode 100644 (file)
index 0000000..b10740e
--- /dev/null
+++ b/core/ranges/ranges-docs.factor
@@ -0,0 +1,28 @@
+USING: help.syntax help.markup arrays sequences ;
+IN: ranges
+
+ARTICLE: "ranges" "Numeric ranges"
+"A " { $emphasis "range" } " is a virtual sequence with real number elements "
+"ranging from " { $emphasis "a" } " to " { $emphasis "b" } " by " { $emphasis "step" } ". Ascending as well as descending ranges are supported."
+$nl
+"The class of ranges:"
+{ $subsections range }
+"Creating ranges with integer end-points. The standard mathematical convention is used, where " { $snippet "(" } " or " { $snippet ")" } " denotes that the end-point itself " { $emphasis "is not" } " part of the range; " { $snippet "[" } " or " { $snippet "]" } " denotes that the end-point " { $emphasis "is" } " part of the range:"
+{ $subsections
+    [a..b]
+    (a..b]
+    [a..b)
+    (a..b)
+    [0..b]
+    [1..b]
+    [0..b)
+}
+"Creating general ranges:"
+{ $subsections <range> }
+"Ranges are most frequently used with sequence combinators as a means of iterating over integers. For example,"
+{ $code "3 10 [a..b] [ sqrt ] map" }
+"Computing the factorial of 100 with a descending range:"
+{ $code "100 1 [a..b] product" }
+"A range can be converted into a concrete sequence using a word such as " { $link >array } ". In most cases this is unnecessary since ranges implement the sequence protocol already. It is necessary if a mutable sequence is needed, for use with words such as " { $link set-nth } " or " { $link map! } "." ;
+
+ABOUT: "ranges"

diff --git a/core/ranges/ranges-tests.factor b/core/ranges/ranges-tests.factor
new file mode 100644 (file)
index 0000000..6d4c605
--- /dev/null
+++ b/core/ranges/ranges-tests.factor
@@ -0,0 +1,57 @@
+USING: arrays kernel math ranges sequences sets tools.test ;
+
+{ { } } [ 1 1 (a..b) >array ] unit-test
+{ { } } [ 1 1 (a..b] >array ] unit-test
+{ { } } [ 1 1 [a..b) >array ] unit-test
+{ { 1 } } [ 1 1 [a..b] >array ] unit-test
+
+{ { }  } [ 1 2 (a..b) >array ] unit-test
+{ { 2 } } [ 1 2 (a..b] >array ] unit-test
+{ { 1 } } [ 1 2 [a..b) >array ] unit-test
+{ { 1 2 } } [ 1 2 [a..b] >array ] unit-test
+
+{ { } } [ 2 1 (a..b) >array ] unit-test
+{ { 1 } } [ 2 1 (a..b] >array ] unit-test
+{ { 2 } } [ 2 1 [a..b) >array ] unit-test
+{ { 2 1 } } [ 2 1 [a..b] >array ] unit-test
+
+{ { 1 2 3 4 5 } } [ 1 5 1 <range> >array ] unit-test
+{ { 5 4 3 2 1 } } [ 5 1 -1 <range> >array ] unit-test
+
+{ { 0 1/3 2/3 1 } } [ 0 1 1/3 <range> >array ] unit-test
+{ { 0 1/3 2/3 1 } } [ 1 0 -1/3 <range> >array reverse ] unit-test
+
+{ 0 } [ 0 -1 .0001 <range> length ] unit-test
+{ 0 } [ 0 -1 .5 <range> length ] unit-test
+{ 0 } [ 0 -1 1 <range> length ] unit-test
+{ 0 } [ 0 -1 2 <range> length ] unit-test
+{ 0 } [ 0 -1 3 <range> length ] unit-test
+{ 0 } [ 0 -1 4 <range> length ] unit-test
+
+{ 0 } [ 0 -2 .0001 <range> length ] unit-test
+{ 0 } [ 0 -2 1 <range> length ] unit-test
+{ 0 } [ 0 -2 2 <range> length ] unit-test
+{ 0 } [ 0 -2 3 <range> length ] unit-test
+{ 0 } [ 0 -2 4 <range> length ] unit-test
+
+{ 0 } [ -1 0 -.0001 <range> length ] unit-test
+{ 0 } [ -1 0 -.5 <range> length ] unit-test
+{ 0 } [ -1 0 -1 <range> length ] unit-test
+{ 0 } [ -1 0 -2 <range> length ] unit-test
+{ 0 } [ -1 0 -3 <range> length ] unit-test
+{ 0 } [ -1 0 -4 <range> length ] unit-test
+
+{ 0 } [ -2 0 -.0001 <range> length ] unit-test
+{ 0 } [ -2 0 -1 <range> length ] unit-test
+{ 0 } [ -2 0 -2 <range> length ] unit-test
+{ 0 } [ -2 0 -3 <range> length ] unit-test
+{ 0 } [ -2 0 -4 <range> length ] unit-test
+
+{ 100 } [
+    1 100 [a..b] [ 2^ [1..b] ] map members length
+] unit-test
+
+{ t } [ -10 10 1 <range> [ sum ] [ >array sum ] bi = ] unit-test
+{ t } [ -10 10 2 <range> [ sum ] [ >array sum ] bi = ] unit-test
+{ t } [ 10 -10 -1 <range> [ sum ] [ >array sum ] bi = ] unit-test
+{ t } [ 10 -10 -2 <range> [ sum ] [ >array sum ] bi = ] unit-test

diff --git a/core/ranges/ranges.factor b/core/ranges/ranges.factor
new file mode 100644 (file)
index 0000000..0373abc
--- /dev/null
+++ b/core/ranges/ranges.factor
@@ -0,0 +1,71 @@
+! Copyright (C) 2008, 2010 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors classes.tuple kernel math math.order sequences
+sequences.private ;
+IN: ranges
+
+TUPLE: range
+{ from read-only }
+{ length read-only }
+{ step read-only } ;
+
+<PRIVATE
+
+: sign/mod ( x y -- z w )
+    [ [ /i ] 2keep pick * - ] keep 0 < [ neg ] when ; inline
+
+PRIVATE>
+
+: <range> ( a b step -- range )
+    [ over - ] dip
+    [ sign/mod 0 < [ 1 + ] unless 0 max ] keep
+    range boa ; inline
+
+M: range length length>> ; inline
+
+M: range nth-unsafe
+    [ step>> * ] keep from>> + ; inline
+
+! We want M\ tuple hashcode, not M\ sequence hashcode here!
+! sequences hashcode is O(n) in number of elements
+M: range hashcode* tuple-hashcode ;
+
+INSTANCE: range immutable-sequence
+
+M: range sum [ length ] [ first ] [ last ] tri + * 2 / ;
+
+<PRIVATE
+
+: twiddle ( a b -- a b step ) 2dup > -1 1 ? ; inline
+
+: (a.. ( a b step -- a' b' step ) dup [ + ] curry 2dip ; inline
+
+: ..b) ( a b step -- a' b' step ) dup [ - ] curry dip ; inline
+
+PRIVATE>
+
+: [a..b] ( a b -- range ) twiddle <range> ; inline
+
+: (a..b] ( a b -- range ) twiddle (a.. <range> ; inline
+
+: [a..b) ( a b -- range ) twiddle ..b) <range> ; inline
+
+: (a..b) ( a b -- range ) twiddle (a.. ..b) <range> ; inline
+
+: [0..b] ( b -- range ) 0 swap [a..b] ; inline
+
+: [1..b] ( b -- range ) 1 swap [a..b] ; inline
+
+: [0..b) ( b -- range ) 0 swap [a..b) ; inline
+
+: [1..b) ( b -- range ) 1 swap [a..b) ; inline
+
+! backwards compatibility for new syntax
+ALIAS: [a,b] [a..b] deprecated
+ALIAS: (a,b] (a..b] deprecated
+ALIAS: [a,b) [a..b) deprecated
+ALIAS: (a,b) (a..b) deprecated
+ALIAS: [0,b] [0..b] deprecated
+ALIAS: [1,b] [1..b] deprecated
+ALIAS: [0,b) [0..b) deprecated
+ALIAS: [1,b) [1..b) deprecated

diff --git a/core/ranges/summary.txt b/core/ranges/summary.txt
new file mode 100644 (file)
index 0000000..3e5e6b9
--- /dev/null
+++ b/core/ranges/summary.txt
@@ -0,0 +1 @@
+Virtual sequence consisting of a range of numbers

diff --git a/core/ranges/tags.txt b/core/ranges/tags.txt
new file mode 100644 (file)
index 0000000..ede10ab
--- /dev/null
+++ b/core/ranges/tags.txt
@@ -0,0 +1 @@
+math

diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor
index 9751964825f025272d33bf10b9cf527130b1f80d..ff4e297c78037dab1323af075acf5f4ce4f53291 100644 (file)
--- a/core/sequences/sequences-docs.factor
+++ b/core/sequences/sequences-docs.factor
@@ -1279,7 +1279,7 @@ HELP: map-sum
 { $description "Like " { $snippet "map sum" } ", but without creating an intermediate sequence." }
 { $examples
     { $example
 { $description "Like " { $snippet "map sum" } ", but without creating an intermediate sequence." }
 { $examples
     { $example

-        "USING: math math.ranges sequences prettyprint ;"
+        "USING: math ranges sequences prettyprint ;"

         "100 [1,b] [ sq ] map-sum ."
         "338350"
     }
         "100 [1,b] [ sq ] map-sum ."
         "338350"
     }


@@ -1290,7 +1290,7 @@ HELP: count
 { $description "Efficiently returns the number of elements that the predicate quotation matches." }
 { $examples
     { $example
 { $description "Efficiently returns the number of elements that the predicate quotation matches." }
 { $examples
     { $example

-        "USING: math math.ranges sequences prettyprint ;"
+        "USING: math ranges sequences prettyprint ;"

         "100 [1,b] [ even? ] count ."
         "50"
     }
         "100 [1,b] [ even? ] count ."
         "50"
     }


@@ -1759,7 +1759,7 @@ ARTICLE: "sequences-integers" "Counted loops"
 $nl
 "Combinators that produce new sequences, such as " { $link map } ", will output an array if the input is an instance of " { $link <iota> } "."
 $nl
 $nl
 "Combinators that produce new sequences, such as " { $link map } ", will output an array if the input is an instance of " { $link <iota> } "."
 $nl

-"More elaborate counted loops can be performed with " { $link "math.ranges" } "." ;
+"More elaborate counted loops can be performed with " { $link "ranges" } "." ;

 
 ARTICLE: "sequences-if" "Control flow with sequences"
 "To reduce the boilerplate of checking if a sequence is empty, several combinators are provided."
 
 ARTICLE: "sequences-if" "Control flow with sequences"
 "To reduce the boilerplate of checking if a sequence is empty, several combinators are provided."


@@ -2085,7 +2085,7 @@ $nl
 "Using sequences for looping:"
 { $subsections
     "sequences-integers"
 "Using sequences for looping:"
 { $subsections
     "sequences-integers"

-    "math.ranges"
+    "ranges"

 }
 "Using sequences for control flow:"
 { $subsections "sequences-if" }
 }
 "Using sequences for control flow:"
 { $subsections "sequences-if" }

diff --git a/extra/99-bottles/99-bottles.factor b/extra/99-bottles/99-bottles.factor
index e05df79744ad654ec678036f36521969a6e28037..d7930273a734adc467c2a9e4d68c82a6afe49331 100644 (file)
--- a/extra/99-bottles/99-bottles.factor
+++ b/extra/99-bottles/99-bottles.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2011 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ascii combinators combinators.smart io kernel math
 ! Copyright (C) 2011 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ascii combinators combinators.smart io kernel math

-math.parser math.ranges sequences splitting ;
+math.parser ranges sequences splitting ;

 IN: 99-bottles
 
 : bottles ( n -- number string )
 IN: 99-bottles
 
 : bottles ( n -- number string )

diff --git a/extra/alien/data/map/map-tests.factor b/extra/alien/data/map/map-tests.factor
index 480e940aeebef980a8ee1ddd8a06a2fbf9b5f45d..24c1f5f830ba7f36b56d4459cdbff25dad5273e7 100644 (file)
--- a/extra/alien/data/map/map-tests.factor
+++ b/extra/alien/data/map/map-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009, 2010 Joe Groff, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.data alien.data.map fry generalizations kernel locals math.vectors
 ! Copyright (C) 2009, 2010 Joe Groff, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.data alien.data.map fry generalizations kernel locals math.vectors

-math.vectors.conversion math math.vectors.simd math.ranges sequences
+math.vectors.conversion math math.vectors.simd ranges sequences

 specialized-arrays tools.test ;
 FROM: alien.c-types => uchar short int float ;
 SPECIALIZED-ARRAYS: int float float-4 uchar-16 ;
 specialized-arrays tools.test ;
 FROM: alien.c-types => uchar short int float ;
 SPECIALIZED-ARRAYS: int float float-4 uchar-16 ;

diff --git a/extra/alien/data/map/map.factor b/extra/alien/data/map/map.factor
index 4b871ce5aebce35aadc33ab11c6568998dc7b7b4..6ad8e4d516ad307c1784c291266ab0bbe7c9e997 100644 (file)
--- a/extra/alien/data/map/map.factor
+++ b/extra/alien/data/map/map.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.data alien.parser arrays
 byte-arrays combinators effects.parser fry generalizations grouping kernel
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.data alien.parser arrays
 byte-arrays combinators effects.parser fry generalizations grouping kernel

-lexer locals macros make math math.ranges parser sequences
+lexer locals macros make math ranges parser sequences

 sequences.generalizations sequences.private ;
 FROM: alien.arrays => array-length ;
 IN: alien.data.map
 sequences.generalizations sequences.private ;
 FROM: alien.arrays => array-length ;
 IN: alien.data.map

diff --git a/extra/alien/fortran/fortran.factor b/extra/alien/fortran/fortran.factor
index 094952d270a30123b24cd411f21ac7bf3a5ea015..8300f1d708518456756cae31ab6fdda9d1f89621 100644 (file)
--- a/extra/alien/fortran/fortran.factor
+++ b/extra/alien/fortran/fortran.factor
@@ -6,7 +6,7 @@ generalizations kernel lexer macros math math.parser namespaces
 parser sequences sequences.generalizations splitting
 stack-checker vectors vocabs.parser words locals
 io.encodings.ascii io.encodings.string shuffle effects
 parser sequences sequences.generalizations splitting
 stack-checker vectors vocabs.parser words locals
 io.encodings.ascii io.encodings.string shuffle effects

-math.ranges math.order sorting strings system alien.libraries ;
+ranges math.order sorting strings system alien.libraries ;

 QUALIFIED-WITH: alien.c-types c
 IN: alien.fortran
 
 QUALIFIED-WITH: alien.c-types c
 IN: alien.fortran
 

diff --git a/extra/audio/engine/test/test.factor b/extra/audio/engine/test/test.factor
index da9a24d72eb0313b13896f6718e2fac0c287f880..7f761f3c40ba5d771e9ecb21cdf5e45c5bfadc9e 100644 (file)
--- a/extra/audio/engine/test/test.factor
+++ b/extra/audio/engine/test/test.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors timers audio audio.engine audio.loader calendar
 ! Copyright (C) 2009 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors timers audio audio.engine audio.loader calendar

-destructors io kernel locals math math.functions math.ranges specialized-arrays
+destructors io kernel locals math math.functions ranges specialized-arrays

 sequences random math.vectors ;
 FROM: alien.c-types => short ;
 SPECIALIZED-ARRAY: short
 sequences random math.vectors ;
 FROM: alien.c-types => short ;
 SPECIALIZED-ARRAY: short

diff --git a/extra/benchmark/backtrack/backtrack.factor b/extra/benchmark/backtrack/backtrack.factor
index f62ca40719c7ab0de082896797086fbd365f6eb1..4aab071b80c1141608dfe8a48b1b858ba8fbd784 100644 (file)
--- a/extra/benchmark/backtrack/backtrack.factor
+++ b/extra/benchmark/backtrack/backtrack.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: backtrack shuffle math math.ranges quotations locals fry
+USING: backtrack shuffle math ranges quotations locals fry

 kernel words io memoize macros prettyprint sequences assocs
 combinators namespaces ;
 IN: benchmark.backtrack
 kernel words io memoize macros prettyprint sequences assocs
 combinators namespaces ;
 IN: benchmark.backtrack

diff --git a/extra/benchmark/beust1/beust1.factor b/extra/benchmark/beust1/beust1.factor
index f8545bfc7c57bb8b842beb810941bf572c78f2b2..a90eb3dc098a16e3b3e78327108abf2d379964d5 100644 (file)
--- a/extra/benchmark/beust1/beust1.factor
+++ b/extra/benchmark/beust1/beust1.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math.ranges math.parser sets sequences ;
+USING: kernel ranges math.parser sets sequences ;

 IN: benchmark.beust1
 
 : count-numbers ( max -- n )
 IN: benchmark.beust1
 
 : count-numbers ( max -- n )

diff --git a/extra/benchmark/beust2/beust2.factor b/extra/benchmark/beust2/beust2.factor
index 732f58bab8fa111bd6768d8a8d34731eb746cfd0..8080170ad9df0b7c90f924640f92be6133240de5 100644 (file)
--- a/extra/benchmark/beust2/beust2.factor
+++ b/extra/benchmark/beust2/beust2.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel locals math math.ranges math.parser sequences ;
+USING: kernel locals math ranges math.parser sequences ;

 IN: benchmark.beust2
 
 ! http://crazybob.org/BeustSequence.java.html
 IN: benchmark.beust2
 
 ! http://crazybob.org/BeustSequence.java.html

diff --git a/extra/benchmark/binary-search/binary-search.factor b/extra/benchmark/binary-search/binary-search.factor
index ddaaa2f66970b0f2cdc041b67ec1d02a551faffc..1754c2f2a6ae94154dd7d55efc100012800a4ee5 100644 (file)
--- a/extra/benchmark/binary-search/binary-search.factor
+++ b/extra/benchmark/binary-search/binary-search.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: binary-search kernel literals math.primes math.ranges
+USING: binary-search kernel literals math.primes ranges

 sequences ;
 IN: benchmark.binary-search
 
 sequences ;
 IN: benchmark.binary-search
 

diff --git a/extra/benchmark/binary-trees/binary-trees.factor b/extra/benchmark/binary-trees/binary-trees.factor
index 4b117bb957a6be26ebe23e1e43545d9aff5645d5..63331f3f86eda944f789acbe154259e028a2ee72 100644 (file)
--- a/extra/benchmark/binary-trees/binary-trees.factor
+++ b/extra/benchmark/binary-trees/binary-trees.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors kernel math math.ranges math.order math.parser
+USING: accessors kernel math ranges math.order math.parser

 io locals sequences ;
 IN: benchmark.binary-trees
 
 io locals sequences ;
 IN: benchmark.binary-trees
 

diff --git a/extra/benchmark/combinatorics/combinatorics.factor b/extra/benchmark/combinatorics/combinatorics.factor
index 272c7f6943d2c18a5d524f92e0f0257a9d7a0193..3581dcdc56a0b210225215adbc1a451d7f17f9e1 100644 (file)
--- a/extra/benchmark/combinatorics/combinatorics.factor
+++ b/extra/benchmark/combinatorics/combinatorics.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 

-USING: combinators kernel math math.combinatorics math.ranges
+USING: combinators kernel math math.combinatorics ranges

 sequences ;
 
 IN: benchmark.combinatorics
 sequences ;
 
 IN: benchmark.combinatorics

diff --git a/extra/benchmark/e-decimals/e-decimals.factor b/extra/benchmark/e-decimals/e-decimals.factor
index 06682325a6155b54988e5319e657f7c9a73c7962..161fc84ea5509130165827905ddb935b2aff6463 100644 (file)
--- a/extra/benchmark/e-decimals/e-decimals.factor
+++ b/extra/benchmark/e-decimals/e-decimals.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: decimals kernel locals math math.combinatorics math.ranges
+USING: decimals kernel locals math math.combinatorics ranges

 sequences ;
 IN: benchmark.e-decimals
 
 sequences ;
 IN: benchmark.e-decimals
 

diff --git a/extra/benchmark/e-ratios/e-ratios.factor b/extra/benchmark/e-ratios/e-ratios.factor
index 6d1e03b4d027390f0480212f12a218c508d6cb36..69e71c09e551279a3a37399326c8c2d5e2c2cd57 100644 (file)
--- a/extra/benchmark/e-ratios/e-ratios.factor
+++ b/extra/benchmark/e-ratios/e-ratios.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.combinatorics math.ranges sequences ;
+USING: kernel math math.combinatorics ranges sequences ;

 IN: benchmark.e-ratios
 
 : calculate-e-ratios ( n -- e )
 IN: benchmark.e-ratios
 
 : calculate-e-ratios ( n -- e )

diff --git a/extra/benchmark/hashtables/hashtables.factor b/extra/benchmark/hashtables/hashtables.factor
index 86ae70036eb7b9ecd92096fd16e637e715bbec5f..4fd605b5172d604938e92a1ec2b1c6e6aac2575f 100644 (file)
--- a/extra/benchmark/hashtables/hashtables.factor
+++ b/extra/benchmark/hashtables/hashtables.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators grouping kernel locals math
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators grouping kernel locals math

-math.parser math.ranges memoize sequences ;
+math.parser ranges memoize sequences ;

 IN: benchmark.hashtables
 
 MEMO: strings ( -- str )
 IN: benchmark.hashtables
 
 MEMO: strings ( -- str )

diff --git a/extra/benchmark/nested-empty-loop-2/nested-empty-loop-2.factor b/extra/benchmark/nested-empty-loop-2/nested-empty-loop-2.factor
index d99ca05a735731c80498470b0532c4d3bfb70686..b2b555fba973297ebe5820212efe404dfb1f4f74 100644 (file)
--- a/extra/benchmark/nested-empty-loop-2/nested-empty-loop-2.factor
+++ b/extra/benchmark/nested-empty-loop-2/nested-empty-loop-2.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges sequences locals hints ;
+USING: kernel math ranges sequences locals hints ;

 IN: benchmark.nested-empty-loop-2
 
 : times ( seq quot -- ) [ drop ] prepose each ; inline
 IN: benchmark.nested-empty-loop-2
 
 : times ( seq quot -- ) [ drop ] prepose each ; inline

diff --git a/extra/benchmark/nsieve-bits/nsieve-bits.factor b/extra/benchmark/nsieve-bits/nsieve-bits.factor
index dbceaf3ecd76973f75ea73ae07ea07928bf8cd13..55b3972b9168d9feb738be3fcb777351e4aa7519 100644 (file)
--- a/extra/benchmark/nsieve-bits/nsieve-bits.factor
+++ b/extra/benchmark/nsieve-bits/nsieve-bits.factor
@@ -1,5 +1,5 @@
 USING: math math.parser sequences sequences.private kernel
 USING: math math.parser sequences sequences.private kernel

-bit-arrays make io math.ranges multiline fry locals ;
+bit-arrays make io ranges multiline fry locals ;

 IN: benchmark.nsieve-bits
 
 : clear-flags ( step i seq -- )
 IN: benchmark.nsieve-bits
 
 : clear-flags ( step i seq -- )

diff --git a/extra/benchmark/sieve/sieve.factor b/extra/benchmark/sieve/sieve.factor
index b9168b3f8c908141472d6476779f768fa2a85e8d..6df370439b3e91c196b26dd9f443a851dd1d122a 100644 (file)
--- a/extra/benchmark/sieve/sieve.factor
+++ b/extra/benchmark/sieve/sieve.factor
@@ -1,4 +1,4 @@
-USING: bit-arrays kernel locals math math.functions math.ranges
+USING: bit-arrays kernel locals math math.functions ranges

 sequences ;
 IN: benchmark.sieve
 
 sequences ;
 IN: benchmark.sieve
 

diff --git a/extra/benchmark/splay/splay.factor b/extra/benchmark/splay/splay.factor
index 7ad9d97bc882bf2faf9b394d5aace3573955c369..50f27f977911dc232cd7156760abdbf6cd235354 100644 (file)
--- a/extra/benchmark/splay/splay.factor
+++ b/extra/benchmark/splay/splay.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 

-USING: arrays assocs kernel math.ranges random sequences sets
+USING: arrays assocs kernel ranges random sequences sets

 sorting trees.splay ;
 
 IN: benchmark.splay
 sorting trees.splay ;
 
 IN: benchmark.splay

diff --git a/extra/bittorrent/bittorrent.factor b/extra/bittorrent/bittorrent.factor
index a4416cb475ac1e43ec9ad063369575eb26336c4d..6c1df4bd522557a2f7d51d129035aa2a0e6c36d0 100644 (file)
--- a/extra/bittorrent/bittorrent.factor
+++ b/extra/bittorrent/bittorrent.factor
@@ -5,7 +5,7 @@ calendar checksums checksums.sha combinators destructors endian
 fry grouping http.client io io.encodings.binary io.files
 io.pathnames io.sockets io.streams.byte-array io.streams.duplex
 kernel literals locals make math math.bitwise math.functions
 fry grouping http.client io io.encodings.binary io.files
 io.pathnames io.sockets io.streams.byte-array io.streams.duplex
 kernel literals locals make math math.bitwise math.functions

-math.order math.parser math.ranges multiline namespaces
+math.order math.parser ranges multiline namespaces

 prettyprint random sequences splitting strings timers
 tools.annotations ui ui.gadgets.panes ui.tools.listener urls
 urls.encoding ;
 prettyprint random sequences splitting strings timers
 tools.annotations ui ui.gadgets.panes ui.tools.listener urls
 urls.encoding ;

diff --git a/extra/boyer-moore/boyer-moore.factor b/extra/boyer-moore/boyer-moore.factor
index 2801262fa14610e38281355630589427666cc805..1461980fca8f8ac5711db475897ec2ab52b64129 100644 (file)
--- a/extra/boyer-moore/boyer-moore.factor
+++ b/extra/boyer-moore/boyer-moore.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Dmitry Shubin.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs kernel locals math math.order
 ! Copyright (C) 2010 Dmitry Shubin.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs kernel locals math math.order

-math.ranges sequences sequences.private z-algorithm ;
+ranges sequences sequences.private z-algorithm ;

 IN: boyer-moore
 
 <PRIVATE
 IN: boyer-moore
 
 <PRIVATE

diff --git a/extra/brainfuck/brainfuck-tests.factor b/extra/brainfuck/brainfuck-tests.factor
index 3cf8fb882ba924efabd178f5c5842593de62e0aa..c377f2e80cde077e33b67c6a424d04fecd78ab77 100644 (file)
--- a/extra/brainfuck/brainfuck-tests.factor
+++ b/extra/brainfuck/brainfuck-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: brainfuck io.streams.string kernel literals math
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: brainfuck io.streams.string kernel literals math

-math.parser math.ranges sequences splitting tools.test ;
+math.parser ranges sequences splitting tools.test ;

 
 [ "+" run-brainfuck ] must-infer
 [ "+" get-brainfuck ] must-infer
 
 [ "+" run-brainfuck ] must-infer
 [ "+" get-brainfuck ] must-infer

diff --git a/extra/bubble-chamber/bubble-chamber.factor b/extra/bubble-chamber/bubble-chamber.factor
index 236b6790c902244febf267f03796d13cb43f8066..f9f3ba8dd3ad80efe65c938a1ba8540d6f26670e 100644 (file)
--- a/extra/bubble-chamber/bubble-chamber.factor
+++ b/extra/bubble-chamber/bubble-chamber.factor
@@ -1,6 +1,6 @@
 USING: accessors arrays ascii calendar colors colors.gray
 combinators.short-circuit fry kernel locals math math.constants
 USING: accessors arrays ascii calendar colors colors.gray
 combinators.short-circuit fry kernel locals math math.constants

-math.functions math.libm math.order math.points math.ranges
+math.functions math.libm math.order math.points ranges

 math.vectors namespaces opengl processing.shapes quotations
 random sequences splitting timers ui ui.gadgets
 ui.gadgets.borders ui.gadgets.buttons ui.gadgets.frame-buffer
 math.vectors namespaces opengl processing.shapes quotations
 random sequences splitting timers ui ui.gadgets
 ui.gadgets.borders ui.gadgets.buttons ui.gadgets.frame-buffer

diff --git a/extra/c/lexer/lexer.factor b/extra/c/lexer/lexer.factor
index a3e328abaa90c21088ec6399d025045495d9eb55..77cf8d2f5893e3d4f5ce8a1daf6c94c78ac89a7f 100644 (file)
--- a/extra/c/lexer/lexer.factor
+++ b/extra/c/lexer/lexer.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators combinators.short-circuit
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators combinators.short-circuit

-generalizations kernel locals math.order math.ranges
+generalizations kernel locals math.order ranges

 sequences.parser sequences sequences.generalizations
 sorting.functor sorting.slots unicode ;
 IN: c.lexer
 sequences.parser sequences sequences.generalizations
 sorting.functor sorting.slots unicode ;
 IN: c.lexer

diff --git a/extra/chess960/chess960.factor b/extra/chess960/chess960.factor
index 36beb7593872deff2f10ab7a86c0ae732fa5ae85..3a487989cb8567a382cd3ef0faee3f6262bbf58f 100644 (file)
--- a/extra/chess960/chess960.factor
+++ b/extra/chess960/chess960.factor
@@ -1,4 +1,4 @@
-USING: math.ranges kernel random sequences arrays combinators ;
+USING: ranges kernel random sequences arrays combinators ;

 IN: chess960
 
 SYMBOLS: pawn rook knight bishop queen king ;
 IN: chess960
 
 SYMBOLS: pawn rook knight bishop queen king ;

diff --git a/extra/crontab/crontab.factor b/extra/crontab/crontab.factor
index 4da0567a813a2dfa1c1cafdefdf66f0f3ca85977..c2e34d9b7de73fc4ede85b76191590736938bf91 100644 (file)
--- a/extra/crontab/crontab.factor
+++ b/extra/crontab/crontab.factor
@@ -3,7 +3,7 @@
 
 USING: accessors arrays ascii assocs calendar calendar.english
 calendar.private combinators combinators.short-circuit io kernel
 
 USING: accessors arrays ascii assocs calendar calendar.english
 calendar.private combinators combinators.short-circuit io kernel

-literals locals math math.order math.parser math.ranges
+literals locals math math.order math.parser ranges

 sequences splitting ;
 
 IN: crontab
 sequences splitting ;
 
 IN: crontab

diff --git a/extra/crypto/aes/aes.factor b/extra/crypto/aes/aes.factor
index 75cd5706263933009a41a169d2b6187029cd0981..48fec0c322dda43b2d880bbc1f7ba11149f3c3e0 100644 (file)
--- a/extra/crypto/aes/aes.factor
+++ b/extra/crypto/aes/aes.factor
@@ -2,7 +2,7 @@
 ! Some parts Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs byte-arrays crypto.aes.utils
 ! Some parts Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs byte-arrays crypto.aes.utils

-generalizations kernel literals math math.bitwise math.ranges
+generalizations kernel literals math math.bitwise ranges

 namespaces sequences sequences.private sequences.unrolled ;
 IN: crypto.aes
 
 namespaces sequences sequences.private sequences.unrolled ;
 IN: crypto.aes
 

diff --git a/extra/game-of-life/game-of-life.factor b/extra/game-of-life/game-of-life.factor
index dbf2a4c1a28ca61680ba528c3e1dcc5ade1d337f..aea776e7533cddd5872a366d0b3ef2e857416956 100644 (file)
--- a/extra/game-of-life/game-of-life.factor
+++ b/extra/game-of-life/game-of-life.factor
@@ -3,7 +3,7 @@
 
 USING: accessors arrays assocs bit-arrays byte-arrays calendar
 colors.constants combinators fry kernel kernel.private locals
 
 USING: accessors arrays assocs bit-arrays byte-arrays calendar
 colors.constants combinators fry kernel kernel.private locals

-math math.order math.ranges namespaces opengl random sequences
+math math.order ranges namespaces opengl random sequences

 sequences.private timers ui ui.commands ui.gadgets
 ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.render words
 ;
 sequences.private timers ui ui.commands ui.gadgets
 ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.render words
 ;

diff --git a/extra/gml/core/core.factor b/extra/gml/core/core.factor
index 2eabdd26e40d8fd7ceb19f0ac38047fe9bc44ddf..41c6985a8061ccc3a3f97d044113d298bfc9a51e 100644 (file)
--- a/extra/gml/core/core.factor
+++ b/extra/gml/core/core.factor
@@ -1,5 +1,5 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! Copyright (C) 2010 Slava Pestov.

-USING: gml.types gml.printer gml.runtime math math.ranges
+USING: gml.types gml.printer gml.runtime math ranges

 continuations combinators arrays kernel vectors accessors
 prettyprint fry sequences assocs locals hashtables grouping
 sorting models ;
 continuations combinators arrays kernel vectors accessors
 prettyprint fry sequences assocs locals hashtables grouping
 sorting models ;

diff --git a/extra/gml/coremath/coremath.factor b/extra/gml/coremath/coremath.factor
index c7a6de23150880519a74a2920c1c8d409c7d0823..124fcf8baead30ca27777af159bf1f3830639c33 100644 (file)
--- a/extra/gml/coremath/coremath.factor
+++ b/extra/gml/coremath/coremath.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2010 Slava Pestov.
 USING: gml.types gml.printer gml.runtime math math.constants
 ! Copyright (C) 2010 Slava Pestov.
 USING: gml.types gml.printer gml.runtime math math.constants

-math.functions math.matrices math.order math.ranges math.trig
+math.functions math.matrices math.order ranges math.trig

 math.vectors continuations combinators arrays kernel vectors
 accessors prettyprint fry sequences assocs locals hashtables
 grouping sorting classes.struct math.vectors.simd
 math.vectors continuations combinators arrays kernel vectors
 accessors prettyprint fry sequences assocs locals hashtables
 grouping sorting classes.struct math.vectors.simd

diff --git a/extra/gml/runtime/runtime.factor b/extra/gml/runtime/runtime.factor
index 123b47475bd5edd949fe6c8a855dad1379f08209..bad5ac53578b716711a6653c9df666cf75aaae57 100644 (file)
--- a/extra/gml/runtime/runtime.factor
+++ b/extra/gml/runtime/runtime.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2010 Slava Pestov.
 USING: accessors arrays assocs fry generic.parser kernel locals
 ! Copyright (C) 2010 Slava Pestov.
 USING: accessors arrays assocs fry generic.parser kernel locals

-locals.parser macros math math.ranges memoize parser sequences
+locals.parser macros math ranges memoize parser sequences

 sequences.private strings strings.parser lexer namespaces
 vectors words generalizations sequences.generalizations
 effects.parser gml.types ;
 sequences.private strings strings.parser lexer namespaces
 vectors words generalizations sequences.generalizations
 effects.parser gml.types ;

diff --git a/extra/gml/viewer/viewer.factor b/extra/gml/viewer/viewer.factor
index 1049127c2bd9b33c10a455cea5c7296afdfff29c..5a56c4a0de42e3d81e856cb4e6abee69933f55b4 100644 (file)
--- a/extra/gml/viewer/viewer.factor
+++ b/extra/gml/viewer/viewer.factor
@@ -4,7 +4,7 @@ destructors euler.b-rep euler.b-rep.triangulation fry game.input
 game.loop game.models.half-edge game.worlds gml.printer gpu
 gpu.buffers gpu.framebuffers gpu.render gpu.shaders gpu.state
 gpu.util.wasd growable images kernel literals locals math
 game.loop game.models.half-edge game.worlds gml.printer gpu
 gpu.buffers gpu.framebuffers gpu.render gpu.shaders gpu.state
 gpu.util.wasd growable images kernel literals locals math

-math.order math.ranges math.vectors math.vectors.conversion
+math.order ranges math.vectors math.vectors.conversion

 math.vectors.simd math.vectors.simd.cords method-chains models
 namespaces sequences sets specialized-vectors typed ui
 ui.gadgets ui.gadgets.worlds ui.gestures ui.pixel-formats
 math.vectors.simd math.vectors.simd.cords method-chains models
 namespaces sequences sets specialized-vectors typed ui
 ui.gadgets ui.gadgets.worlds ui.gestures ui.pixel-formats

diff --git a/extra/grid-meshes/grid-meshes.factor b/extra/grid-meshes/grid-meshes.factor
index 54db1161dbd188b70778ffa7c157eff493b93ac7..c15e9f46eb9da1012435d0cb827a9a6862d0b2eb 100644 (file)
--- a/extra/grid-meshes/grid-meshes.factor
+++ b/extra/grid-meshes/grid-meshes.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.data.map arrays destructors fry grouping
 ! Copyright (C) 2009 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.data.map arrays destructors fry grouping

-kernel math math.ranges math.vectors.simd opengl opengl.gl sequences
+kernel math ranges math.vectors.simd opengl opengl.gl sequences

 sequences.product specialized-arrays ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float-4
 sequences.product specialized-arrays ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float-4

diff --git a/extra/hamurabi/hamurabi.factor b/extra/hamurabi/hamurabi.factor
index 876f9c3713e5fab0aa53d5933f582fc5f0857da8..2bdccb7560e18cce765591f9e78222f42dfb16a3 100644 (file)
--- a/extra/hamurabi/hamurabi.factor
+++ b/extra/hamurabi/hamurabi.factor
@@ -3,7 +3,7 @@
 
 USING: accessors combinators combinators.short-circuit
 continuations formatting fry io kernel math math.functions
 
 USING: accessors combinators combinators.short-circuit
 continuations formatting fry io kernel math math.functions

-math.order math.parser math.ranges random sequences strings ;
+math.order math.parser ranges random sequences strings ;

 
 IN: hamurabi
 
 
 IN: hamurabi
 

diff --git a/extra/hashcash/hashcash.factor b/extra/hashcash/hashcash.factor
index 017cb4bcd0956edd21fe77dd543e6d4a43796b15..a8e597058d25f6984b28546755670b572937b692 100644 (file)
--- a/extra/hashcash/hashcash.factor
+++ b/extra/hashcash/hashcash.factor
@@ -3,7 +3,7 @@
 USING: accessors byte-arrays calendar checksums
 checksums.openssl classes.tuple formatting io.encodings.ascii
 io.encodings.string kernel literals math math.functions
 USING: accessors byte-arrays calendar checksums
 checksums.openssl classes.tuple formatting io.encodings.ascii
 io.encodings.string kernel literals math math.functions

-math.parser math.ranges present random sequences splitting ;
+math.parser ranges present random sequences splitting ;

 IN: hashcash
 
 ! Hashcash implementation
 IN: hashcash
 
 ! Hashcash implementation

diff --git a/extra/html/entities/entities.factor b/extra/html/entities/entities.factor
index b47c53e640e9d8a53d5dc002e54c6477e0950903..34cfe30c5703acc23c6857cb3c35814023f26e5c 100644 (file)
--- a/extra/html/entities/entities.factor
+++ b/extra/html/entities/entities.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: assocs combinators.short-circuit kernel make math
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: assocs combinators.short-circuit kernel make math

-math.order math.parser math.ranges regexp sequences splitting
+math.order math.parser ranges regexp sequences splitting

 strings ;
 
 IN: html.entities
 strings ;
 
 IN: html.entities

diff --git a/extra/id3/id3.factor b/extra/id3/id3.factor
index 0c6880bf3b80c2834c89b68981fbed3d04a6634f..7d1f68af139794e27e1304a080d562967db64333 100644 (file)
--- a/extra/id3/id3.factor
+++ b/extra/id3/id3.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Tim Wawrzynczak, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: sequences io io.encodings.binary io.files io.pathnames
 ! Copyright (C) 2009 Tim Wawrzynczak, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: sequences io io.encodings.binary io.files io.pathnames

-strings kernel math io.mmap accessors combinators math.ranges
+strings kernel math io.mmap accessors combinators ranges

 unicode byte-arrays io.encodings.string
 io.encodings.utf16 assocs math.parser combinators.short-circuit
 fry namespaces combinators.smart splitting io.encodings.ascii
 unicode byte-arrays io.encodings.string
 io.encodings.utf16 assocs math.parser combinators.short-circuit
 fry namespaces combinators.smart splitting io.encodings.ascii

diff --git a/extra/images/tga/tga.factor b/extra/images/tga/tga.factor
index b592851db06dabfbc99260edc891389dca39f9d3..231e14acef30f47c233759134fa6431d1847183c 100644 (file)
--- a/extra/images/tga/tga.factor
+++ b/extra/images/tga/tga.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors endian images images.loader io kernel
 locals math sequences io.encodings.ascii io.encodings.string
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors endian images images.loader io kernel
 locals math sequences io.encodings.ascii io.encodings.string

-calendar math.ranges math.parser colors arrays hashtables
+calendar ranges math.parser colors arrays hashtables

 ui.pixel-formats combinators continuations io.streams.throwing ;
 IN: images.tga
 
 ui.pixel-formats combinators continuations io.streams.throwing ;
 IN: images.tga
 

diff --git a/extra/imap/imap-tests.factor b/extra/imap/imap-tests.factor
index d9b7231c7b827f18afe3b9f7d4fa9a3ef715fb35..976447d7a349fd6f2c08d625b987c903e743aa6c 100644 (file)
--- a/extra/imap/imap-tests.factor
+++ b/extra/imap/imap-tests.factor
@@ -1,6 +1,6 @@
 USING: accessors arrays assocs calendar calendar.format calendar.parser
 combinators continuations destructors formatting fry grouping.extras imap
 USING: accessors arrays assocs calendar calendar.format calendar.parser
 combinators continuations destructors formatting fry grouping.extras imap

-imap.private io.streams.duplex kernel math math.parser math.ranges
+imap.private io.streams.duplex kernel math math.parser ranges

 namespaces random sequences sets sorting uuid multiline
 splitting strings system tools.test memoize combinators.smart ;
 FROM: pcre => findall ;
 namespaces random sequences sets sorting uuid multiline
 splitting strings system tools.test memoize combinators.smart ;
 FROM: pcre => findall ;

diff --git a/extra/infix/infix.factor b/extra/infix/infix.factor
index 5de1ca52eaca18f61ce250bf172c13e3b1d8778d..e9850a95da7cb644389c8563ee9772804afd7bd8 100644 (file)
--- a/extra/infix/infix.factor
+++ b/extra/infix/infix.factor
@@ -3,7 +3,7 @@
 USING: accessors combinators combinators.short-circuit effects
 effects.parser fry infix.ast infix.parser kernel locals
 locals.parser locals.types math math.functions math.order
 USING: accessors combinators combinators.short-circuit effects
 effects.parser fry infix.ast infix.parser kernel locals
 locals.parser locals.types math math.functions math.order

-math.ranges multiline parser quotations sequences summary
+ranges multiline parser quotations sequences summary

 vocabs.parser words words.constant ;
 IN: infix
 
 vocabs.parser words words.constant ;
 IN: infix
 

diff --git a/extra/io/streams/256color/256color.factor b/extra/io/streams/256color/256color.factor
index a8b44baaae2f6928446fdb3f4582a7c1cd9d52c1..153ed0a866a9e640e61cb27e918ca216f99c2b11 100644 (file)
--- a/extra/io/streams/256color/256color.factor
+++ b/extra/io/streams/256color/256color.factor
@@ -3,7 +3,7 @@
 
 USING: accessors arrays assocs destructors environment
 formatting fry io io.streams.string io.styles kernel locals
 
 USING: accessors arrays assocs destructors environment
 formatting fry io io.streams.string io.styles kernel locals

-math math.functions math.ranges math.vectors namespaces
+math math.functions ranges math.vectors namespaces

 sequences sequences.extras strings strings.tables ;
 
 IN: io.streams.256color
 sequences sequences.extras strings strings.tables ;
 
 IN: io.streams.256color

diff --git a/extra/jamshred/player/player.factor b/extra/jamshred/player/player.factor
index 64bd75205e77df06fee0632ae69fbce603999497..53f37806951820d818bdbb17e8689747dbe11db8 100644 (file)
--- a/extra/jamshred/player/player.factor
+++ b/extra/jamshred/player/player.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors colors.constants combinators jamshred.log
 jamshred.oint jamshred.sound jamshred.tunnel kernel locals math
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors colors.constants combinators jamshred.log
 jamshred.oint jamshred.sound jamshred.tunnel kernel locals math

-math.constants math.order math.ranges math.vectors math.matrices
+math.constants math.order ranges math.vectors math.matrices

 sequences shuffle specialized-arrays strings system ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAY: c:float
 sequences shuffle specialized-arrays strings system ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAY: c:float

diff --git a/extra/jamshred/tunnel/tunnel.factor b/extra/jamshred/tunnel/tunnel.factor
index 94e4d7b8b0a08858749f6be722fde2706c5487d3..633b8750436803569eb56b6d53709076ad995df9 100644 (file)
--- a/extra/jamshred/tunnel/tunnel.factor
+++ b/extra/jamshred/tunnel/tunnel.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays colors combinators fry jamshred.oint
 kernel literals locals math math.constants math.matrices
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays colors combinators fry jamshred.oint
 kernel literals locals math math.constants math.matrices

-math.order math.quadratic math.ranges math.vectors random
+math.order math.quadratic ranges math.vectors random

 sequences specialized-arrays vectors ;
 FROM: jamshred.oint => distance ;
 FROM: alien.c-types => float ;
 sequences specialized-arrays vectors ;
 FROM: jamshred.oint => distance ;
 FROM: alien.c-types => float ;

diff --git a/extra/managed-server/managed-server.factor b/extra/managed-server/managed-server.factor
index a8070abbbfb2359dda01c819270b92c0bacae39d..43c00f6f22abb21de96f99bd4fba9488411dae3a 100644 (file)
--- a/extra/managed-server/managed-server.factor
+++ b/extra/managed-server/managed-server.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs calendar continuations destructors io
 io.encodings.binary io.servers io.sockets
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs calendar continuations destructors io
 io.encodings.binary io.servers io.sockets

-io.streams.duplex fry kernel locals math math.ranges multiline
+io.streams.duplex fry kernel locals math ranges multiline

 namespaces prettyprint random sequences sets splitting threads
 tools.continuations ;
 IN: managed-server
 namespaces prettyprint random sequences sets splitting threads
 tools.continuations ;
 IN: managed-server

diff --git a/extra/math/derivatives/syntax/syntax.factor b/extra/math/derivatives/syntax/syntax.factor
index e639083cdec2718ba376151e7742eeb2177174df..78336b15c43b880afd3851fbc487f4bc737b5860 100644 (file)
--- a/extra/math/derivatives/syntax/syntax.factor
+++ b/extra/math/derivatives/syntax/syntax.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Jason W. Merrill.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2009 Jason W. Merrill.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors effects kernel lexer math.ranges parser
+USING: accessors effects kernel lexer ranges parser

 sequences words ;
 IN: math.derivatives.syntax
 
 sequences words ;
 IN: math.derivatives.syntax
 

diff --git a/extra/math/extras/extras-tests.factor b/extra/math/extras/extras-tests.factor
index 8967451fd13c45dc8ea6458622f53c8153c22dd7..b5dbbbd9beb4caf55f9712b8363835d57cb92cfa 100644 (file)
--- a/extra/math/extras/extras-tests.factor
+++ b/extra/math/extras/extras-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 

-USING: arrays kernel math math.extras math.ranges sequences
+USING: arrays kernel math math.extras ranges sequences

 tools.test ;
 
 { 7 } [ 4 2 stirling ] unit-test
 tools.test ;
 
 { 7 } [ 4 2 stirling ] unit-test

diff --git a/extra/math/extras/extras.factor b/extra/math/extras/extras.factor
index 8b876e92b0d23cc5600f8c192d69886fd60916c2..0c3c9c9ce66355cd82dfa521ce670beb97dc62a3 100644 (file)
--- a/extra/math/extras/extras.factor
+++ b/extra/math/extras/extras.factor
@@ -5,7 +5,7 @@ USING: accessors arrays assocs assocs.extras byte-arrays
 combinators combinators.short-circuit compression.zlib fry
 grouping kernel locals math math.bitwise math.combinatorics
 math.constants math.functions math.order math.primes
 combinators combinators.short-circuit compression.zlib fry
 grouping kernel locals math math.bitwise math.combinatorics
 math.constants math.functions math.order math.primes

-math.primes.factors math.ranges math.ranges.private
+math.primes.factors ranges ranges.private

 math.statistics math.vectors memoize parser random sequences
 sequences.extras sequences.private sets sorting sorting.extras ;
 
 math.statistics math.vectors memoize parser random sequences
 sequences.extras sequences.private sets sorting sorting.extras ;
 

diff --git a/extra/math/factorials/factorials-tests.factor b/extra/math/factorials/factorials-tests.factor
index b2a06d8efac28b90676ab2979dea18b021a87e14..f35f713a124f908a8d58a40bf25b8c2f540b4d1b 100644 (file)
--- a/extra/math/factorials/factorials-tests.factor
+++ b/extra/math/factorials/factorials-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel math.factorials math.functions math.ranges sequences tools.test ;
+USING: kernel math.factorials math.functions ranges sequences tools.test ;

 
 { 1 } [ -1 factorial ] unit-test ! not necessarily correct
 { 1 } [ 0 factorial ] unit-test
 
 { 1 } [ -1 factorial ] unit-test ! not necessarily correct
 { 1 } [ 0 factorial ] unit-test

diff --git a/extra/math/factorials/factorials.factor b/extra/math/factorials/factorials.factor
index ff6272f555d05f264e829b2655b78be4543bfd5d..c97194af8002f5ff80c64370e294b8b5ab718ab5 100644 (file)
--- a/extra/math/factorials/factorials.factor
+++ b/extra/math/factorials/factorials.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: combinators combinators.short-circuit fry inverse kernel
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: combinators combinators.short-circuit fry inverse kernel

-math math.functions math.primes math.ranges memoize sequences ;
+math math.functions math.primes ranges memoize sequences ;

 
 IN: math.factorials
 
 
 IN: math.factorials
 

diff --git a/extra/math/numerical-integration/numerical-integration.factor b/extra/math/numerical-integration/numerical-integration.factor
index acc22fa2a2bc989e5148c1f6f21ff4b0619fc0a5..27ea4530f2d7f6c59775e17f789f408f26bea507 100644 (file)
--- a/extra/math/numerical-integration/numerical-integration.factor
+++ b/extra/math/numerical-integration/numerical-integration.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges math.vectors namespaces
+USING: kernel math ranges math.vectors namespaces

 sequences ;
 IN: math.numerical-integration
 
 sequences ;
 IN: math.numerical-integration
 

diff --git a/extra/math/primes/solovay-strassen/solovay-strassen.factor b/extra/math/primes/solovay-strassen/solovay-strassen.factor
index 4c7d0c9db31217be77cc85acead84ad3f400c7c0..167baa6a45ea8c4b74369048a2cdab0b284ca714 100644 (file)
--- a/extra/math/primes/solovay-strassen/solovay-strassen.factor
+++ b/extra/math/primes/solovay-strassen/solovay-strassen.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: combinators kernel locals math math.extras
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: combinators kernel locals math math.extras

-math.extras.private math.functions math.ranges random sequences ;
+math.extras.private math.functions ranges random sequences ;

 
 IN: math.primes.solovay-strassen
 
 
 IN: math.primes.solovay-strassen
 

diff --git a/extra/mongodb/benchmark/benchmark.factor b/extra/mongodb/benchmark/benchmark.factor
index f9e6ff552626950adf8abc67fefa3663df175d3b..00c09715eae2203768fca260a15cd84271812f94 100644 (file)
--- a/extra/mongodb/benchmark/benchmark.factor
+++ b/extra/mongodb/benchmark/benchmark.factor
@@ -1,4 +1,4 @@
-USING: calendar math fry kernel assocs math.ranges bson.reader io.streams.byte-array
+USING: calendar math fry kernel assocs ranges bson.reader io.streams.byte-array

 sequences formatting combinators namespaces io tools.time prettyprint io.encodings.binary
 accessors words mongodb.driver strings math.parser bson.writer
 hashtables ;
 sequences formatting combinators namespaces io tools.time prettyprint io.encodings.binary
 accessors words mongodb.driver strings math.parser bson.writer
 hashtables ;

diff --git a/extra/nurbs/nurbs.factor b/extra/nurbs/nurbs.factor
index 0536193730ab092425422ea0bafd845e715695b4..662e39cf1265b975ffe7d6f0e913740c491c3fa1 100644 (file)
--- a/extra/nurbs/nurbs.factor
+++ b/extra/nurbs/nurbs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Joe Groff
 ! See http://factorcode.org/license.txt for BSD license
 USING: accessors alien.c-types grouping kernel locals math
 ! Copyright (C) 2009 Joe Groff
 ! See http://factorcode.org/license.txt for BSD license
 USING: accessors alien.c-types grouping kernel locals math

-math.order math.ranges math.vectors math.vectors.homogeneous
+math.order ranges math.vectors math.vectors.homogeneous

 sequences specialized-arrays ;
 SPECIALIZED-ARRAY: alien.c-types:float
 IN: nurbs
 sequences specialized-arrays ;
 SPECIALIZED-ARRAY: alien.c-types:float
 IN: nurbs

diff --git a/extra/pcre/pcre-tests.factor b/extra/pcre/pcre-tests.factor
index abadc761c0b60e42edb9c52ee27d86af2544ba12..a7360b1087f14144999aace5a71484133ae1b995 100644 (file)
--- a/extra/pcre/pcre-tests.factor
+++ b/extra/pcre/pcre-tests.factor
@@ -1,5 +1,5 @@
 USING: accessors arrays assocs continuations http.client kernel
 USING: accessors arrays assocs continuations http.client kernel

-literals math math.parser math.ranges pcre pcre.ffi pcre.private
+literals math math.parser ranges pcre pcre.ffi pcre.private

 random sequences system tools.test ;
 QUALIFIED: regexp
 QUALIFIED: splitting
 random sequences system tools.test ;
 QUALIFIED: regexp
 QUALIFIED: splitting

diff --git a/extra/pdf/layout/layout.factor b/extra/pdf/layout/layout.factor
index 2ec599d8655887bf28fd77a1506031cd99c4d585..764f82ba073665ff9d134bcd173f41c482840c4d 100644 (file)
--- a/extra/pdf/layout/layout.factor
+++ b/extra/pdf/layout/layout.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 USING: accessors assocs calendar combinators environment fonts
 formatting fry io io.streams.string kernel literals locals make
 ! See http://factorcode.org/license.txt for BSD license
 USING: accessors assocs calendar combinators environment fonts
 formatting fry io io.streams.string kernel literals locals make

-math math.order math.ranges namespaces pdf.canvas pdf.values
+math math.order ranges namespaces pdf.canvas pdf.values

 pdf.wrap sequences sequences.extras sorting splitting ui.text
 xml.entities ;
 FROM: pdf.canvas => draw-text ;
 pdf.wrap sequences sequences.extras sorting splitting ui.text
 xml.entities ;
 FROM: pdf.canvas => draw-text ;

diff --git a/extra/picomath/picomath-tests.factor b/extra/picomath/picomath-tests.factor
index ee1f219e9c502a964d8c0c2532dfae13254e661a..a7c01c0eb3f8d7aabbb783e2f418d142c1a31ef7 100644 (file)
--- a/extra/picomath/picomath-tests.factor
+++ b/extra/picomath/picomath-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 

-USING: kernel literals math math.functions math.ranges picomath
+USING: kernel literals math math.functions ranges picomath

 sequences tools.test ;
 
 IN: picomath
 sequences tools.test ;
 
 IN: picomath

diff --git a/extra/pong/pong.factor b/extra/pong/pong.factor
index 1e8c7c990fe8bdc546a81ec1f36383f21c67a193..1ceedbe45f1ea5f9b4f41d97bf2c9b111c8082ee 100644 (file)
--- a/extra/pong/pong.factor
+++ b/extra/pong/pong.factor
@@ -1,6 +1,6 @@
 USING: accessors arrays calendar colors.constants
 combinators.short-circuit fonts fry kernel literals locals math
 USING: accessors arrays calendar colors.constants
 combinators.short-circuit fonts fry kernel literals locals math

-math.order math.ranges math.vectors namespaces opengl random
+math.order ranges math.vectors namespaces opengl random

 sequences timers ui ui.commands ui.gadgets ui.gadgets.worlds
 ui.gestures ui.pens.solid ui.render ui.text ;
 
 sequences timers ui ui.commands ui.gadgets ui.gadgets.worlds
 ui.gestures ui.pens.solid ui.render ui.text ;
 

diff --git a/extra/pop3/pop3.factor b/extra/pop3/pop3.factor
index 2179c44930cab3aaa72fa1196b95c77b9a66cd63..ed987c6324cd136349d903842d1d556fd27d904c 100644 (file)
--- a/extra/pop3/pop3.factor
+++ b/extra/pop3/pop3.factor
@@ -3,7 +3,7 @@
 USING: accessors annotations arrays assocs calendar combinators
 fry hashtables io io.crlf io.encodings.utf8 io.sockets
 io.streams.duplex io.timeouts kernel make math math.parser
 USING: accessors annotations arrays assocs calendar combinators
 fry hashtables io io.crlf io.encodings.utf8 io.sockets
 io.streams.duplex io.timeouts kernel make math math.parser

-math.ranges namespaces prettyprint sequences splitting
+ranges namespaces prettyprint sequences splitting

 strings ;
 IN: pop3
 
 strings ;
 IN: pop3
 

diff --git a/extra/project-euler/001/001.factor b/extra/project-euler/001/001.factor
index 1c6b100cda0e97a3dd3ccf71ab28aa7065a54f16..920909eabd7c3f9b8340256e5dede69edfdca647 100644 (file)
--- a/extra/project-euler/001/001.factor
+++ b/extra/project-euler/001/001.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007-2009 Aaron Schaefer, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007-2009 Aaron Schaefer, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions math.ranges project-euler.common sequences
+USING: kernel math math.functions ranges project-euler.common sequences

     sets ;
 IN: project-euler.001
 
     sets ;
 IN: project-euler.001
 

diff --git a/extra/project-euler/004/004.factor b/extra/project-euler/004/004.factor
index 42b33263b1f9ac7911660d0b9f1089b99c1ca623..42cbc17fe4fab5c63250a3de48b1d166f835ee83 100644 (file)
--- a/extra/project-euler/004/004.factor
+++ b/extra/project-euler/004/004.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Aaron Schaefer, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007 Aaron Schaefer, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: hashtables kernel math math.functions math.ranges project-euler.common
+USING: hashtables kernel math math.functions ranges project-euler.common

     sequences sorting sets ;
 IN: project-euler.004
 
     sequences sorting sets ;
 IN: project-euler.004
 

diff --git a/extra/project-euler/005/005.factor b/extra/project-euler/005/005.factor
index 633edbdcb56406d2df485cd852e1890ced2b21c2..012bf0bfa2af8f2ef8001c5f7a481babce3a2a53 100644 (file)
--- a/extra/project-euler/005/005.factor
+++ b/extra/project-euler/005/005.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007, 2009 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007, 2009 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: math math.functions math.ranges project-euler.common sequences ;
+USING: math math.functions ranges project-euler.common sequences ;

 IN: project-euler.005
 
 ! http://projecteuler.net/index.php?section=problems&id=5
 IN: project-euler.005
 
 ! http://projecteuler.net/index.php?section=problems&id=5

diff --git a/extra/project-euler/006/006.factor b/extra/project-euler/006/006.factor
index faefb767a4764080452199727332fd6b3629e249..737230b4a7a2f3f456e82ac3adce2d15ef927f29 100644 (file)
--- a/extra/project-euler/006/006.factor
+++ b/extra/project-euler/006/006.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges sequences project-euler.common ;
+USING: kernel math ranges sequences project-euler.common ;

 IN: project-euler.006
 
 ! http://projecteuler.net/index.php?section=problems&id=6
 IN: project-euler.006
 
 ! http://projecteuler.net/index.php?section=problems&id=6

diff --git a/extra/project-euler/014/014.factor b/extra/project-euler/014/014.factor
index 7d901f1038027453570e6ca76a96546fcfd20fca..faceb179cf6b5e5ecbde0461f82c8a6d467e29f6 100644 (file)
--- a/extra/project-euler/014/014.factor
+++ b/extra/project-euler/014/014.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: combinators.short-circuit kernel make math math.functions math.ranges
+USING: combinators.short-circuit kernel make math math.functions ranges

     sequences project-euler.common ;
 IN: project-euler.014
 
     sequences project-euler.common ;
 IN: project-euler.014
 

diff --git a/extra/project-euler/017/017.factor b/extra/project-euler/017/017.factor
index 2c326a43823db2c625dd3579dab74cafd964d96a..694e4366c142199c13d6686fdad03754b6ef68fb 100644 (file)
--- a/extra/project-euler/017/017.factor
+++ b/extra/project-euler/017/017.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: ascii kernel math.ranges math.text.english sequences
+USING: ascii kernel ranges math.text.english sequences

 project-euler.common ;
 IN: project-euler.017
 
 project-euler.common ;
 IN: project-euler.017
 

diff --git a/extra/project-euler/018/018.factor b/extra/project-euler/018/018.factor
index c10738887d4a45bf16a5503d2209226b6b918eb7..95906406439357f65db6f8dd6542724a8c2d1928 100644 (file)
--- a/extra/project-euler/018/018.factor
+++ b/extra/project-euler/018/018.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Samuel Tardieu, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007 Samuel Tardieu, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges project-euler.common sequences ;
+USING: kernel math ranges project-euler.common sequences ;

 IN: project-euler.018
 
 ! http://projecteuler.net/index.php?section=problems&id=18
 IN: project-euler.018
 
 ! http://projecteuler.net/index.php?section=problems&id=18

diff --git a/extra/project-euler/019/019.factor b/extra/project-euler/019/019.factor
index 6f0f00fcb2ca680565f43b2ec7ab6c85ae131d9b..3922156b476799528d43c65be1b50e386e1a768d 100644 (file)
--- a/extra/project-euler/019/019.factor
+++ b/extra/project-euler/019/019.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Samuel Tardieu, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007 Samuel Tardieu, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: calendar combinators kernel math math.ranges namespaces sequences
+USING: calendar combinators kernel math ranges namespaces sequences

     math.order project-euler.common ;
 IN: project-euler.019
 
     math.order project-euler.common ;
 IN: project-euler.019
 

diff --git a/extra/project-euler/021/021.factor b/extra/project-euler/021/021.factor
index ef0d4191dea9ccb31ffacb332300cef36c400d0b..bf83ffe07dc367b1245a00d3d433942e8096decb 100644 (file)
--- a/extra/project-euler/021/021.factor
+++ b/extra/project-euler/021/021.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.short-circuit kernel math math.functions
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.short-circuit kernel math math.functions

-    math.ranges namespaces project-euler.common sequences ;
+    ranges namespaces project-euler.common sequences ;

 IN: project-euler.021
 
 ! http://projecteuler.net/index.php?section=problems&id=21
 IN: project-euler.021
 
 ! http://projecteuler.net/index.php?section=problems&id=21

diff --git a/extra/project-euler/023/023.factor b/extra/project-euler/023/023.factor
index e001970f71607a7b2428168f1f7144b6cce7fbdb..f1f5c66eed79ad36802e9c3e0200f3cbca211e6d 100644 (file)
--- a/extra/project-euler/023/023.factor
+++ b/extra/project-euler/023/023.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: fry kernel math math.ranges project-euler.common
+USING: fry kernel math ranges project-euler.common

 sequences sets ;
 IN: project-euler.023
 
 sequences sets ;
 IN: project-euler.023
 

diff --git a/extra/project-euler/026/026.factor b/extra/project-euler/026/026.factor
index efec389e18602440acdfe30bc282fc6ffa4d8879..c0aec158ab07ce87e4e9d1917969ad416dad48ea 100644 (file)
--- a/extra/project-euler/026/026.factor
+++ b/extra/project-euler/026/026.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions math.primes math.ranges sequences project-euler.common ;
+USING: kernel math math.functions math.primes ranges sequences project-euler.common ;

 IN: project-euler.026
 
 ! http://projecteuler.net/index.php?section=problems&id=26
 IN: project-euler.026
 
 ! http://projecteuler.net/index.php?section=problems&id=26

diff --git a/extra/project-euler/027/027.factor b/extra/project-euler/027/027.factor
index 6dda6a502b927f7ee1cf3aba2bb3586332313d6b..94abee17866c39a6449dab2e3f97e825c67354b7 100644 (file)
--- a/extra/project-euler/027/027.factor
+++ b/extra/project-euler/027/027.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.primes math.ranges project-euler.common sequences ;
+USING: kernel math math.primes ranges project-euler.common sequences ;

 IN: project-euler.027
 
 ! http://projecteuler.net/index.php?section=problems&id=27
 IN: project-euler.027
 
 ! http://projecteuler.net/index.php?section=problems&id=27

diff --git a/extra/project-euler/028/028.factor b/extra/project-euler/028/028.factor
index b134d369de13febc5ad1d172967aa0ee72eef53e..7ff66a1c417632e4b7b7b958a9d68ffa8232cd7a 100644 (file)
--- a/extra/project-euler/028/028.factor
+++ b/extra/project-euler/028/028.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges sequences project-euler.common ;
+USING: kernel math ranges sequences project-euler.common ;

 IN: project-euler.028
 
 ! http://projecteuler.net/index.php?section=problems&id=28
 IN: project-euler.028
 
 ! http://projecteuler.net/index.php?section=problems&id=28

diff --git a/extra/project-euler/029/029.factor b/extra/project-euler/029/029.factor
index f48b58c5d7a5f53111c129fa35e1b0eb1d2c17a8..1fc194e6ff1dfdc5adb2ce4af107ba5026aa40b1 100644 (file)
--- a/extra/project-euler/029/029.factor
+++ b/extra/project-euler/029/029.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: hashtables kernel math.functions math.ranges project-euler.common
+USING: hashtables kernel math.functions ranges project-euler.common

     sequences sets ;
 IN: project-euler.029
 
     sequences sets ;
 IN: project-euler.029
 

diff --git a/extra/project-euler/030/030.factor b/extra/project-euler/030/030.factor
index 6c7dbd9d87d1de4fb3ce78873fc352525637adcd..1acd8a52b851633ebe7fe7467ed677d6e71dd7da 100644 (file)
--- a/extra/project-euler/030/030.factor
+++ b/extra/project-euler/030/030.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions math.ranges project-euler.common sequences ;
+USING: kernel math math.functions ranges project-euler.common sequences ;

 IN: project-euler.030
 
 ! http://projecteuler.net/index.php?section=problems&id=30
 IN: project-euler.030
 
 ! http://projecteuler.net/index.php?section=problems&id=30

diff --git a/extra/project-euler/032/032.factor b/extra/project-euler/032/032.factor
index cc545d8bb39781a8072c8861be066db295a7977e..f891cc5ad7b4dee948f84f0665bb68f9d0236565 100644 (file)
--- a/extra/project-euler/032/032.factor
+++ b/extra/project-euler/032/032.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.combinatorics math.functions math.parser math.ranges
+USING: kernel math math.combinatorics math.functions math.parser ranges

     project-euler.common sequences sets ;
 IN: project-euler.032
 
     project-euler.common sequences sets ;
 IN: project-euler.032
 

diff --git a/extra/project-euler/033/033.factor b/extra/project-euler/033/033.factor
index 909680d4722d3dcd94998a2314fe5ef7a0b431f7..c12376404c21e5100e2d17b96e2b4db58b525f1e 100644 (file)
--- a/extra/project-euler/033/033.factor
+++ b/extra/project-euler/033/033.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges project-euler.common sequences ;
+USING: kernel math ranges project-euler.common sequences ;

 IN: project-euler.033
 
 ! http://projecteuler.net/index.php?section=problems&id=33
 IN: project-euler.033
 
 ! http://projecteuler.net/index.php?section=problems&id=33

diff --git a/extra/project-euler/034/034.factor b/extra/project-euler/034/034.factor
index 1a76f76ee72803516ee515166f03e352660a56ca..293bc292e0ba4722042e7e3e3a40aa7ebaefd5b1 100644 (file)
--- a/extra/project-euler/034/034.factor
+++ b/extra/project-euler/034/034.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math.ranges project-euler.common sequences ;
+USING: kernel ranges project-euler.common sequences ;

 IN: project-euler.034
 
 ! http://projecteuler.net/index.php?section=problems&id=34
 IN: project-euler.034
 
 ! http://projecteuler.net/index.php?section=problems&id=34

diff --git a/extra/project-euler/036/036.factor b/extra/project-euler/036/036.factor
index e6c257969e60ac8624be1e7c8f52a103cb8c65eb..e5a0af55cbd62355ddff8ac315af4074b2dcb5cc 100644 (file)
--- a/extra/project-euler/036/036.factor
+++ b/extra/project-euler/036/036.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: combinators.short-circuit kernel math.parser math.ranges
+USING: combinators.short-circuit kernel math.parser ranges

     project-euler.common sequences ;
 IN: project-euler.036
 
     project-euler.common sequences ;
 IN: project-euler.036
 

diff --git a/extra/project-euler/038/038.factor b/extra/project-euler/038/038.factor
index 100f59efc2e54414fc796bed2e5b9003cbe55be8..0fee4c89d726099a7e09d670935f14b51a1c9e1e 100644 (file)
--- a/extra/project-euler/038/038.factor
+++ b/extra/project-euler/038/038.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges project-euler.common sequences
+USING: kernel math ranges project-euler.common sequences

     strings ;
 IN: project-euler.038
 
     strings ;
 IN: project-euler.038
 

diff --git a/extra/project-euler/039/039.factor b/extra/project-euler/039/039.factor
index 613e03a05cd437b142a4d2a1e3467d737efd2c9b..e55fb1c668f3a42b56b587b23009854d03003366 100644 (file)
--- a/extra/project-euler/039/039.factor
+++ b/extra/project-euler/039/039.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays kernel math math.ranges namespaces project-euler.common
+USING: arrays kernel math ranges namespaces project-euler.common

 sequences sequences.extras ;
 IN: project-euler.039
 
 sequences sequences.extras ;
 IN: project-euler.039
 

diff --git a/extra/project-euler/043/043.factor b/extra/project-euler/043/043.factor
index 79f4cfce6beb1a7449710e242036b1c2b3bafbbf..ae8e923a93a6a84b851ab7942febb318d5990033 100644 (file)
--- a/extra/project-euler/043/043.factor
+++ b/extra/project-euler/043/043.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.short-circuit kernel math math.functions math.combinatorics
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.short-circuit kernel math math.functions math.combinatorics

-    math.ranges project-euler.common sequences sets sorting ;
+    ranges project-euler.common sequences sets sorting ;

 IN: project-euler.043
 
 ! http://projecteuler.net/index.php?section=problems&id=43
 IN: project-euler.043
 
 ! http://projecteuler.net/index.php?section=problems&id=43

diff --git a/extra/project-euler/044/044.factor b/extra/project-euler/044/044.factor
index 9a2f580c89e9b6e916e1c4692098c11f23f46c39..25ead5e1c1538072656f8f2d89022804dd76842e 100644 (file)
--- a/extra/project-euler/044/044.factor
+++ b/extra/project-euler/044/044.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions math.ranges math.order
+USING: kernel math math.functions ranges math.order

 project-euler.common sequences layouts ;
 IN: project-euler.044
 
 project-euler.common sequences layouts ;
 IN: project-euler.044
 

diff --git a/extra/project-euler/046/046.factor b/extra/project-euler/046/046.factor
index e129363fa94ae0494bee49ec3c582584d0b36c83..72e117f3814b1db794acc3f82585f87e279976c1 100644 (file)
--- a/extra/project-euler/046/046.factor
+++ b/extra/project-euler/046/046.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions math.primes math.ranges
+USING: kernel math math.functions math.primes ranges

 sequences project-euler.common math.bitwise ;
 IN: project-euler.046
 
 sequences project-euler.common math.bitwise ;
 IN: project-euler.046
 

diff --git a/extra/project-euler/047/047.factor b/extra/project-euler/047/047.factor
index 3e49659382b323fa48841b4d41ca6ccc5f0e0f5c..f787c29f6085af0f2d30d50441c5093445619e61 100644 (file)
--- a/extra/project-euler/047/047.factor
+++ b/extra/project-euler/047/047.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel math math.primes math.primes.factors
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel math math.primes math.primes.factors

-    math.ranges namespaces sequences project-euler.common ;
+    ranges namespaces sequences project-euler.common ;

 IN: project-euler.047
 
 ! http://projecteuler.net/index.php?section=problems&id=47
 IN: project-euler.047
 
 ! http://projecteuler.net/index.php?section=problems&id=47

diff --git a/extra/project-euler/048/048.factor b/extra/project-euler/048/048.factor
index 48ad1083be6cf9681929842413e1bbbebbce977f..0e5a75d524164fe7602dcc56cc430e856f612576 100644 (file)
--- a/extra/project-euler/048/048.factor
+++ b/extra/project-euler/048/048.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions math.ranges
+USING: kernel math math.functions ranges

 project-euler.common sequences ;
 IN: project-euler.048
 
 project-euler.common sequences ;
 IN: project-euler.048
 

diff --git a/extra/project-euler/051/051.factor b/extra/project-euler/051/051.factor
index 23df9f50af16c74d07115370b35a4b0f6c8e1831..514b9ca8313e7f4353b38e8665ae0393a4f74846 100644 (file)
--- a/extra/project-euler/051/051.factor
+++ b/extra/project-euler/051/051.factor
@@ -27,7 +27,7 @@
 ! for each prime number, count the families it belongs to. When one reaches count of 8, stop, and get the smallest number by replacing * with ones.
 
 USING: assocs fry kernel math math.combinatorics math.functions
 ! for each prime number, count the families it belongs to. When one reaches count of 8, stop, and get the smallest number by replacing * with ones.
 
 USING: assocs fry kernel math math.combinatorics math.functions

-math.order math.parser math.primes math.ranges namespaces
+math.order math.parser math.primes ranges namespaces

 project-euler.common sequences sets ;
 IN: project-euler.051
 <PRIVATE
 project-euler.common sequences sets ;
 IN: project-euler.051
 <PRIVATE

diff --git a/extra/project-euler/053/053.factor b/extra/project-euler/053/053.factor
index 9974f4a3c1a7c79ff52fb57de88bfa574734d910..47ca35b0b96b266bd2202f5c254e2926e32ff6cc 100644 (file)
--- a/extra/project-euler/053/053.factor
+++ b/extra/project-euler/053/053.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.combinatorics math.ranges sequences project-euler.common ;
+USING: kernel math math.combinatorics ranges sequences project-euler.common ;

 IN: project-euler.053
 
 ! http://projecteuler.net/index.php?section=problems&id=53
 IN: project-euler.053
 
 ! http://projecteuler.net/index.php?section=problems&id=53

diff --git a/extra/project-euler/055/055.factor b/extra/project-euler/055/055.factor
index a523d6b696753f9bd3b55918be2824c53cd7edc5..598fad9bce127e2f41b0738e672b061d42ca2ed2 100644 (file)
--- a/extra/project-euler/055/055.factor
+++ b/extra/project-euler/055/055.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges project-euler.common sequences ;
+USING: kernel math ranges project-euler.common sequences ;

 IN: project-euler.055
 
 ! http://projecteuler.net/index.php?section=problems&id=55
 IN: project-euler.055
 
 ! http://projecteuler.net/index.php?section=problems&id=55

diff --git a/extra/project-euler/056/056.factor b/extra/project-euler/056/056.factor
index 3a727563990e5c9fa769a3ec52c2b10f2c136099..3e81c887af4b35bc54ba2c39f19c88183e82372d 100644 (file)
--- a/extra/project-euler/056/056.factor
+++ b/extra/project-euler/056/056.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math.functions math.ranges project-euler.common
+USING: kernel math.functions ranges project-euler.common

 sequences math.order ;
 IN: project-euler.056
 
 sequences math.order ;
 IN: project-euler.056
 

diff --git a/extra/project-euler/057/057.factor b/extra/project-euler/057/057.factor
index 2850881ac52fa7602bf673c9f130b02a8b6cb555..42e2edc6f52c0d31fbf19e917636980da814c7e1 100644 (file)
--- a/extra/project-euler/057/057.factor
+++ b/extra/project-euler/057/057.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Samuel Tardieu
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Samuel Tardieu
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions math.parser math.ranges project-euler.common
+USING: kernel math math.functions math.parser ranges project-euler.common

     sequences ;
 IN: project-euler.057
 
     sequences ;
 IN: project-euler.057
 

diff --git a/extra/project-euler/058/058.factor b/extra/project-euler/058/058.factor
index 489121b8bfd5399533f19d44af3584bb20924b17..e28ce2968f74a9e7b6ebb2b2f12134198e83c5ad 100644 (file)
--- a/extra/project-euler/058/058.factor
+++ b/extra/project-euler/058/058.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2009 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2009 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: fry kernel math math.primes math.ranges project-euler.common sequences ;
+USING: fry kernel math math.primes ranges project-euler.common sequences ;

 IN: project-euler.058
 
 ! http://projecteuler.net/index.php?section=problems&id=58
 IN: project-euler.058
 
 ! http://projecteuler.net/index.php?section=problems&id=58

diff --git a/extra/project-euler/063/063.factor b/extra/project-euler/063/063.factor
index b1e892f160a15b8586b5b68a8bc5095b146f2bb3..246e7539eb7af59f281891c5a0929ce810fc3d4f 100644 (file)
--- a/extra/project-euler/063/063.factor
+++ b/extra/project-euler/063/063.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2009 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2009 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions math.ranges project-euler.common sequences ;
+USING: kernel math math.functions ranges project-euler.common sequences ;

 IN: project-euler.063
 
 ! http://projecteuler.net/index.php?section=problems&id=63
 IN: project-euler.063
 
 ! http://projecteuler.net/index.php?section=problems&id=63

diff --git a/extra/project-euler/064/064.factor b/extra/project-euler/064/064.factor
index 9b4751e275bf76f2d15659b6af3463562460b0b0..7c0a3779094c7abea9ab271b113dd1403e572693 100644 (file)
--- a/extra/project-euler/064/064.factor
+++ b/extra/project-euler/064/064.factor
@@ -1,5 +1,5 @@
 USING: accessors arrays classes.tuple io kernel locals math
 USING: accessors arrays classes.tuple io kernel locals math

-math.functions math.ranges prettyprint project-euler.common
+math.functions ranges prettyprint project-euler.common

 sequences ;
 IN: project-euler.064
 
 sequences ;
 IN: project-euler.064
 

diff --git a/extra/project-euler/069/069.factor b/extra/project-euler/069/069.factor
index ad6f2571a9a6c2bcf7688a5904878c9aa17d0621..f3b0b830fcf9ac868355a69fef23c1150798268a 100644 (file)
--- a/extra/project-euler/069/069.factor
+++ b/extra/project-euler/069/069.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2009 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators fry kernel math math.primes math.primes.factors
 ! Copyright (c) 2009 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators fry kernel math math.primes math.primes.factors

-math.ranges project-euler.common sequences sequences.extras ;
+ranges project-euler.common sequences sequences.extras ;

 IN: project-euler.069
 
 ! http://projecteuler.net/index.php?section=problems&id=69
 IN: project-euler.069
 
 ! http://projecteuler.net/index.php?section=problems&id=69

diff --git a/extra/project-euler/072/072.factor b/extra/project-euler/072/072.factor
index 40783c929017aacecfa8842c4ffa29afa0ae967b..c0304847699fd69f573e4ab3adf5d215e54d793a 100644 (file)
--- a/extra/project-euler/072/072.factor
+++ b/extra/project-euler/072/072.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.primes.factors math.ranges
+USING: kernel math math.primes.factors ranges

 project-euler.common sequences ;
 IN: project-euler.072
 
 project-euler.common sequences ;
 IN: project-euler.072
 

diff --git a/extra/project-euler/074/074.factor b/extra/project-euler/074/074.factor
index 3e2211d4c387158f5b7c4c2c30f0c9397a9a71a3..3b47ff5753cd7eee78ed6dcdb38ee75ff2483874 100644 (file)
--- a/extra/project-euler/074/074.factor
+++ b/extra/project-euler/074/074.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: hash-sets kernel math.ranges project-euler.common
+USING: hash-sets kernel ranges project-euler.common

 sequences sets ;
 IN: project-euler.074
 
 sequences sets ;
 IN: project-euler.074
 

diff --git a/extra/project-euler/075/075.factor b/extra/project-euler/075/075.factor
index 7285078bcf0cb19c481e1f92eeeaca978479526e..17c72a983db9a799a2aaad349e93f7753c962ca9 100644 (file)
--- a/extra/project-euler/075/075.factor
+++ b/extra/project-euler/075/075.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays kernel math math.ranges
+USING: arrays kernel math ranges

     namespaces project-euler.common sequences ;
 IN: project-euler.075
 
     namespaces project-euler.common sequences ;
 IN: project-euler.075
 

diff --git a/extra/project-euler/076/076.factor b/extra/project-euler/076/076.factor
index f31354c0a233db034aee56e160fe07976d36a1fa..435258b62fe962af8737c61bcf70bc90143f9a54 100644 (file)
--- a/extra/project-euler/076/076.factor
+++ b/extra/project-euler/076/076.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays assocs kernel locals math math.order math.ranges sequences project-euler.common ;
+USING: arrays assocs kernel locals math math.order ranges sequences project-euler.common ;

 IN: project-euler.076
 
 ! http://projecteuler.net/index.php?section=problems&id=76
 IN: project-euler.076
 
 ! http://projecteuler.net/index.php?section=problems&id=76

diff --git a/extra/project-euler/081/081.factor b/extra/project-euler/081/081.factor
index d3776ef1d474807aa9f1cf743d8a86632f580077..3721a47f4cf4577b821f476cffb6a75e1b787f38 100644 (file)
--- a/extra/project-euler/081/081.factor
+++ b/extra/project-euler/081/081.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: fry io.encodings.ascii io.files locals kernel math
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: fry io.encodings.ascii io.files locals kernel math

-math.order math.parser math.ranges sequences splitting
+math.order math.parser ranges sequences splitting

 project-euler.common ;
 IN: project-euler.081
 
 project-euler.common ;
 IN: project-euler.081
 

diff --git a/extra/project-euler/085/085.factor b/extra/project-euler/085/085.factor
index 8696046d0c0f5984486f21a414fd5da03121f900..b0785aa294c85969c8733903a9095d1f4b4b0960 100644 (file)
--- a/extra/project-euler/085/085.factor
+++ b/extra/project-euler/085/085.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors kernel math math.ranges project-euler.common
+USING: accessors kernel math ranges project-euler.common

 sequences locals ;
 IN: project-euler.085
 
 sequences locals ;
 IN: project-euler.085
 

diff --git a/extra/project-euler/092/092.factor b/extra/project-euler/092/092.factor
index 6d03d7d9b2757bf4078f9fa6496887c56e4b553e..55849eef8993dc9ef7b9a06f2f50cd98386e2d1d 100644 (file)
--- a/extra/project-euler/092/092.factor
+++ b/extra/project-euler/092/092.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges project-euler.common sequences ;
+USING: kernel math ranges project-euler.common sequences ;

 IN: project-euler.092
 
 ! http://projecteuler.net/index.php?section=problems&id=92
 IN: project-euler.092
 
 ! http://projecteuler.net/index.php?section=problems&id=92

diff --git a/extra/project-euler/116/116.factor b/extra/project-euler/116/116.factor
index 4a250305a1a2838d5cb57ef76013d6601bcc4d28..d2e5249bac7b5e4ce08a8e978b625dc3a6b62bf1 100644 (file)
--- a/extra/project-euler/116/116.factor
+++ b/extra/project-euler/116/116.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.ranges sequences project-euler.common ;
+USING: kernel math ranges sequences project-euler.common ;

 IN: project-euler.116
 
 ! http://projecteuler.net/index.php?section=problems&id=116
 IN: project-euler.116
 
 ! http://projecteuler.net/index.php?section=problems&id=116

diff --git a/extra/project-euler/124/124.factor b/extra/project-euler/124/124.factor
index 6e68dd0d1fe95c59f61a6bcb37b6d36c9ed6a177..e1a2b6abfb7f6e84d193c1bd25d8e853b4d6e95b 100644 (file)
--- a/extra/project-euler/124/124.factor
+++ b/extra/project-euler/124/124.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel math.primes.factors
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel math.primes.factors

-math.ranges project-euler.common sequences sorting ;
+ranges project-euler.common sequences sorting ;

 IN: project-euler.124
 
 ! http://projecteuler.net/index.php?section=problems&id=124
 IN: project-euler.124
 
 ! http://projecteuler.net/index.php?section=problems&id=124

diff --git a/extra/project-euler/134/134.factor b/extra/project-euler/134/134.factor
index ef1cf30dc0e22576d0c2fd3d643e6687a61b29d4..503746b78c4c96cf7c0517624cb94fa03a089ca1 100644 (file)
--- a/extra/project-euler/134/134.factor
+++ b/extra/project-euler/134/134.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel lists lists.lazy math.algebra math math.functions
 ! Copyright (c) 2007 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel lists lists.lazy math.algebra math math.functions

-    math.order math.primes.lists math.ranges project-euler.common sequences ;
+    math.order math.primes.lists ranges project-euler.common sequences ;

 IN: project-euler.134
 
 ! http://projecteuler.net/index.php?section=problems&id=134
 IN: project-euler.134
 
 ! http://projecteuler.net/index.php?section=problems&id=134

diff --git a/extra/project-euler/150/150.factor b/extra/project-euler/150/150.factor
index 4e411e1e79661fbcecd292f5e45dec95f227dddf..9399fe63d3a4d3caca68b0d6109f47f06b717db1 100644 (file)
--- a/extra/project-euler/150/150.factor
+++ b/extra/project-euler/150/150.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel locals math math.order math.ranges math.statistics
+USING: kernel locals math math.order ranges math.statistics

 project-euler.common sequences sequences.private ;
 IN: project-euler.150
 
 project-euler.common sequences sequences.private ;
 IN: project-euler.150
 

diff --git a/extra/project-euler/164/164.factor b/extra/project-euler/164/164.factor
index 366ebc0bd8aadf4f710173c069953127f3b34738..ece4865ac11d0cfa28d5054b52071ec46ab1e098 100644 (file)
--- a/extra/project-euler/164/164.factor
+++ b/extra/project-euler/164/164.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays assocs kernel math math.ranges sequences project-euler.common ;
+USING: arrays assocs kernel math ranges sequences project-euler.common ;

 IN: project-euler.164
 
 ! http://projecteuler.net/index.php?section=problems&id=164
 IN: project-euler.164
 
 ! http://projecteuler.net/index.php?section=problems&id=164

diff --git a/extra/project-euler/173/173.factor b/extra/project-euler/173/173.factor
index c52d1e97b8dd623dbf18676b282e04656bd2ab04..f3998d9206c8699dfd315200ea1ce10e2d8d56fe 100644 (file)
--- a/extra/project-euler/173/173.factor
+++ b/extra/project-euler/173/173.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions math.ranges sequences project-euler.common ;
+USING: kernel math math.functions ranges sequences project-euler.common ;

 IN: project-euler.173
 
 ! http://projecteuler.net/index.php?section=problems&id=173
 IN: project-euler.173
 
 ! http://projecteuler.net/index.php?section=problems&id=173

diff --git a/extra/project-euler/175/175.factor b/extra/project-euler/175/175.factor
index 3473d9327c8dfd4180506326f72ced70ad69f2de..b1bb6e3b893ae1378bbde5692b4328b62852883d 100644 (file)
--- a/extra/project-euler/175/175.factor
+++ b/extra/project-euler/175/175.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: combinators kernel math math.parser math.ranges sequences vectors project-euler.common ;
+USING: combinators kernel math math.parser ranges sequences vectors project-euler.common ;

 IN: project-euler.175
 
 ! http://projecteuler.net/index.php?section=problems&id=175
 IN: project-euler.175
 
 ! http://projecteuler.net/index.php?section=problems&id=175

diff --git a/extra/project-euler/186/186.factor b/extra/project-euler/186/186.factor
index 3f5a9a2f85ea5278e4be8b524a7b2e4c70996fac..f52ade2c756056d65d6dc54eb17b592acc183975 100644 (file)
--- a/extra/project-euler/186/186.factor
+++ b/extra/project-euler/186/186.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: circular disjoint-sets kernel math math.ranges sequences project-euler.common ;
+USING: circular disjoint-sets kernel math ranges sequences project-euler.common ;

 IN: project-euler.186
 
 ! http://projecteuler.net/index.php?section=problems&id=186
 IN: project-euler.186
 
 ! http://projecteuler.net/index.php?section=problems&id=186

diff --git a/extra/project-euler/190/190.factor b/extra/project-euler/190/190.factor
index 5f78f38441d4cdc83cab942b6b316ade965fbcbe..4f1437fd766f7ecfd668e6030d4d2f5fa812fe22 100644 (file)
--- a/extra/project-euler/190/190.factor
+++ b/extra/project-euler/190/190.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel sequences math math.functions math.ranges locals project-euler.common ;
+USING: kernel sequences math math.functions ranges locals project-euler.common ;

 IN: project-euler.190
 
 ! http://projecteuler.net/index.php?section=problems&id=190
 IN: project-euler.190
 
 ! http://projecteuler.net/index.php?section=problems&id=190

diff --git a/extra/project-euler/206/206.factor b/extra/project-euler/206/206.factor
index 10f5259bdc4146382612eee01836f17554acb482..13f4369cbf78caed099783b47f83477046799e45 100644 (file)
--- a/extra/project-euler/206/206.factor
+++ b/extra/project-euler/206/206.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2010 Aaron Schaefer. All rights reserved.
 ! The contents of this file are licensed under the Simplified BSD License
 ! A copy of the license is available at http://factorcode.org/license.txt
 ! Copyright (c) 2010 Aaron Schaefer. All rights reserved.
 ! The contents of this file are licensed under the Simplified BSD License
 ! A copy of the license is available at http://factorcode.org/license.txt

-USING: grouping kernel math math.ranges project-euler.common
+USING: grouping kernel math ranges project-euler.common

 sequences sequences.cords assocs ;
 IN: project-euler.206
 
 sequences sequences.cords assocs ;
 IN: project-euler.206
 

diff --git a/extra/project-euler/255/255.factor b/extra/project-euler/255/255.factor
index 40bcce4b90dc2675bf535526ec80b9f3acffa75d..25974746ced0d37305ff926323f279025ecc90de 100644 (file)
--- a/extra/project-euler/255/255.factor
+++ b/extra/project-euler/255/255.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2009 Jon Harper.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2009 Jon Harper.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays io kernel locals math math.functions math.parser math.ranges
+USING: arrays io kernel locals math math.functions math.parser ranges

     namespaces prettyprint project-euler.common sequences threads ;
 IN: project-euler.255
 
     namespaces prettyprint project-euler.common sequences threads ;
 IN: project-euler.255
 

diff --git a/extra/project-euler/common/common.factor b/extra/project-euler/common/common.factor
index 68f25106210609f6bfef1e0bd6b428aea94652ce..54ca443191be35de867c769a7b770036af1c39d3 100644 (file)
--- a/extra/project-euler/common/common.factor
+++ b/extra/project-euler/common/common.factor
@@ -3,7 +3,7 @@
 ! A copy of the license is available at http://factorcode.org/license.txt
 USING: accessors arrays byte-arrays fry hints kernel lists make
 math math.functions math.matrices math.order math.parser
 ! A copy of the license is available at http://factorcode.org/license.txt
 USING: accessors arrays byte-arrays fry hints kernel lists make
 math math.functions math.matrices math.order math.parser

-math.primes.factors math.primes.lists math.ranges math.ratios
+math.primes.factors math.primes.lists ranges math.ratios

 math.vectors parser prettyprint sequences sorting strings
 unicode vocabs.parser words ;
 IN: project-euler.common
 math.vectors parser prettyprint sequences sorting strings
 unicode vocabs.parser words ;
 IN: project-euler.common

diff --git a/extra/raylib/demo/gui/gui.factor b/extra/raylib/demo/gui/gui.factor
index 7095ebe721e1dc4cead423809bb4a45766c65ef3..6e598212dfe9ec94e518a88213c562359a8a167f 100644 (file)
--- a/extra/raylib/demo/gui/gui.factor
+++ b/extra/raylib/demo/gui/gui.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2019 Jack Lucas
 ! See http://factorcode.org/license.txt for BSD license.
 
 ! Copyright (C) 2019 Jack Lucas
 ! See http://factorcode.org/license.txt for BSD license.
 

-USING: raylib kernel math.ranges sequences locals random
+USING: raylib kernel ranges sequences locals random

 combinators.random  math threads calendar namespaces accessors
 classes.struct combinators alien.enums ;
 
 combinators.random  math threads calendar namespaces accessors
 classes.struct combinators alien.enums ;
 

diff --git a/extra/rosetta-code/100-doors/100-doors.factor b/extra/rosetta-code/100-doors/100-doors.factor
index 6b54ce3783c9bc1d8fecb26b04337a555444b6f1..ea2a5c881ec6e5028da5e371350b97762f8711b2 100644 (file)
--- a/extra/rosetta-code/100-doors/100-doors.factor
+++ b/extra/rosetta-code/100-doors/100-doors.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.

-USING: bit-arrays formatting fry kernel math math.ranges
+USING: bit-arrays formatting fry kernel math ranges

 sequences ;
 IN: rosetta-code.100-doors
 
 sequences ;
 IN: rosetta-code.100-doors
 

diff --git a/extra/rosetta-code/bitmap-line/bitmap-line.factor b/extra/rosetta-code/bitmap-line/bitmap-line.factor
index 8c393f269fdef358fba1f7ad589eeea2d2c48c8f..0b4062222d5da403e3da79192941301f4b3113ba 100644 (file)
--- a/extra/rosetta-code/bitmap-line/bitmap-line.factor
+++ b/extra/rosetta-code/bitmap-line/bitmap-line.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays kernel locals math math.functions
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays kernel locals math math.functions

-math.ranges math.vectors rosetta-code.bitmap sequences
+ranges math.vectors rosetta-code.bitmap sequences

 ui.gadgets ;
 IN: rosetta-code.bitmap-line
 
 ui.gadgets ;
 IN: rosetta-code.bitmap-line
 

diff --git a/extra/rosetta-code/bulls-and-cows/bulls-and-cows.factor b/extra/rosetta-code/bulls-and-cows/bulls-and-cows.factor
index 683c0b6c9537c6689b17c3dcc1919c0c6c0699ac..d30907fe05b55b09438b1d211b2b0be1552c80cf 100644 (file)
--- a/extra/rosetta-code/bulls-and-cows/bulls-and-cows.factor
+++ b/extra/rosetta-code/bulls-and-cows/bulls-and-cows.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators fry grouping hashtables
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators fry grouping hashtables

-kernel locals math math.parser math.ranges random sequences
+kernel locals math math.parser ranges random sequences

 strings io ascii ;
 IN: rosetta-code.bulls-and-cows
 
 strings io ascii ;
 IN: rosetta-code.bulls-and-cows
 

diff --git a/extra/rosetta-code/continued-fraction/continued-fraction.factor b/extra/rosetta-code/continued-fraction/continued-fraction.factor
index 4834887fdd9ebabe55556d9dbbd026b4b242a030..462b26e81760a9df151d5902f0838073cae1abb6 100644 (file)
--- a/extra/rosetta-code/continued-fraction/continued-fraction.factor
+++ b/extra/rosetta-code/continued-fraction/continued-fraction.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays combinators io kernel locals math math.functions
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays combinators io kernel locals math math.functions

-math.ranges prettyprint sequences ;
+ranges prettyprint sequences ;

 IN: rosetta-code.continued-fraction
 
 ! http://rosettacode.org/wiki/Continued_fraction
 IN: rosetta-code.continued-fraction
 
 ! http://rosettacode.org/wiki/Continued_fraction

diff --git a/extra/rosetta-code/count-the-coins/count-the-coins.factor b/extra/rosetta-code/count-the-coins/count-the-coins.factor
index 46e665d34a48ad0af1b1d336ab4e239c0322e095..fdf61214466078e2370b520862fac2e7e83f67a1 100644 (file)
--- a/extra/rosetta-code/count-the-coins/count-the-coins.factor
+++ b/extra/rosetta-code/count-the-coins/count-the-coins.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays locals math math.ranges sequences sets sorting ;
+USING: arrays locals math ranges sequences sets sorting ;

 IN: rosetta-code.count-the-coins
 
 ! http://rosettacode.org/wiki/Count_the_coins
 IN: rosetta-code.count-the-coins
 
 ! http://rosettacode.org/wiki/Count_the_coins

diff --git a/extra/rosetta-code/dice7/dice7.factor b/extra/rosetta-code/dice7/dice7.factor
index 928ee2fc03906a99ea60f30a7fa4b41b81624d4b..f8db9c4ce61937c1efdfd5b2be93d4a1399a9720 100644 (file)
--- a/extra/rosetta-code/dice7/dice7.factor
+++ b/extra/rosetta-code/dice7/dice7.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2015 Alexander Ilin, Doug Coleman, John Benediktsson.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2015 Alexander Ilin, Doug Coleman, John Benediktsson.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: assocs fry kernel locals math math.ranges math.statistics
+USING: assocs fry kernel locals math ranges math.statistics

 math.vectors prettyprint random sequences sorting ;
 IN: rosetta-code.dice7
 
 math.vectors prettyprint random sequences sorting ;
 IN: rosetta-code.dice7
 

diff --git a/extra/rosetta-code/fizzbuzz/fizzbuzz.factor b/extra/rosetta-code/fizzbuzz/fizzbuzz.factor
index 0663a5b6d25463fa66c00b4f0e2451288c1c8b4a..adaca37217c112ff5b22cf8ab0ae568549ee2315 100644 (file)
--- a/extra/rosetta-code/fizzbuzz/fizzbuzz.factor
+++ b/extra/rosetta-code/fizzbuzz/fizzbuzz.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.

-USING: io kernel math math.functions math.parser math.ranges
+USING: io kernel math math.functions math.parser ranges

 sequences ;
 IN: rosetta-code.fizzbuzz
 
 sequences ;
 IN: rosetta-code.fizzbuzz
 

diff --git a/extra/rosetta-code/gray-code/gray-code.factor b/extra/rosetta-code/gray-code/gray-code.factor
index a0f80c380ca6f2e28d24be49523e9da022184ae7..9ad642c75dfb5e1ae1d44021c9258df0c44bcb8b 100644 (file)
--- a/extra/rosetta-code/gray-code/gray-code.factor
+++ b/extra/rosetta-code/gray-code/gray-code.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays kernel locals math math.parser math.ranges
+USING: arrays kernel locals math math.parser ranges

 prettyprint sequences ;
 IN: rosetta-code.gray-code
 
 prettyprint sequences ;
 IN: rosetta-code.gray-code
 

diff --git a/extra/rosetta-code/hailstone-sequence/hailstone-sequence.factor b/extra/rosetta-code/hailstone-sequence/hailstone-sequence.factor
index 3d251a6afdefd6a2e20689fad275b710300131d2..261310d0ff6412ffa74487af4892d7f30ba37d5b 100644 (file)
--- a/extra/rosetta-code/hailstone-sequence/hailstone-sequence.factor
+++ b/extra/rosetta-code/hailstone-sequence/hailstone-sequence.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays io kernel math math.ranges prettyprint sequences vectors ;
+USING: arrays io kernel math ranges prettyprint sequences vectors ;

 IN: rosetta-code.hailstone-sequence
 
 ! http://rosettacode.org/wiki/Hailstone_sequence
 IN: rosetta-code.hailstone-sequence
 
 ! http://rosettacode.org/wiki/Hailstone_sequence

diff --git a/extra/rosetta-code/josephus-problem/josephus-problem.factor b/extra/rosetta-code/josephus-problem/josephus-problem.factor
index 64a658d9d5703c0b98725d5b3e13a3c07a888269..68cc9f4462c6dfd930662b74797f9449b49ab09c 100644 (file)
--- a/extra/rosetta-code/josephus-problem/josephus-problem.factor
+++ b/extra/rosetta-code/josephus-problem/josephus-problem.factor
@@ -1,4 +1,4 @@
-USING: kernel locals math math.ranges sequences ;
+USING: kernel locals math ranges sequences ;

 IN: rosetta-code.josephus-problem
 
 ! http://rosettacode.org/wiki/Josephus_problem
 IN: rosetta-code.josephus-problem
 
 ! http://rosettacode.org/wiki/Josephus_problem

diff --git a/extra/rosetta-code/knapsack/knapsack.factor b/extra/rosetta-code/knapsack/knapsack.factor
index 1264e58683bc31b205a39e58c04f72e13eeb9112..959cab21bdc4aef20a1c36ce38b49e00f9e9776d 100644 (file)
--- a/extra/rosetta-code/knapsack/knapsack.factor
+++ b/extra/rosetta-code/knapsack/knapsack.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays fry io kernel locals make math
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays fry io kernel locals make math

-math.order math.parser math.ranges sequences sorting ;
+math.order math.parser ranges sequences sorting ;

 IN: rosetta-code.knapsack
 
 ! http://rosettacode.org/wiki/Knapsack_problem/0-1
 IN: rosetta-code.knapsack
 
 ! http://rosettacode.org/wiki/Knapsack_problem/0-1

diff --git a/extra/rosetta-code/luhn-test/luhn-test.factor b/extra/rosetta-code/luhn-test/luhn-test.factor
index e0af49231cfadfdf24f359187a62bd13bb2582ff..6e707dfe8d50b8fa23753e6b4a1a56d7c0ff6f25 100644 (file)
--- a/extra/rosetta-code/luhn-test/luhn-test.factor
+++ b/extra/rosetta-code/luhn-test/luhn-test.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.parser math.order math.ranges sequences ;
+USING: kernel math math.parser math.order ranges sequences ;

 IN: rosetta-code.luhn-test
 
 ! http://rosettacode.org/wiki/Luhn_test_of_credit_card_numbers
 IN: rosetta-code.luhn-test
 
 ! http://rosettacode.org/wiki/Luhn_test_of_credit_card_numbers

diff --git a/extra/rosetta-code/multiplication-tables/multiplication-tables.factor b/extra/rosetta-code/multiplication-tables/multiplication-tables.factor
index bf4e450b4540a93d00acc74720636f8f6ff3d8ea..2384dbaedd87fd63df2f3b2fb6b157d62267d00c 100644 (file)
--- a/extra/rosetta-code/multiplication-tables/multiplication-tables.factor
+++ b/extra/rosetta-code/multiplication-tables/multiplication-tables.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.

-USING: io kernel math math.parser math.ranges sequences ;
+USING: io kernel math math.parser ranges sequences ;

 IN: rosetta-code.multiplication-tables
 
 ! http://rosettacode.org/wiki/Multiplication_tables
 IN: rosetta-code.multiplication-tables
 
 ! http://rosettacode.org/wiki/Multiplication_tables

diff --git a/extra/rosetta-code/number-reversal/number-reversal.factor b/extra/rosetta-code/number-reversal/number-reversal.factor
index 930c05969123d6806baf864495fbe501fc6780d8..45098012561ace996071392818a0d2323ae38697 100644 (file)
--- a/extra/rosetta-code/number-reversal/number-reversal.factor
+++ b/extra/rosetta-code/number-reversal/number-reversal.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.

-USING: formatting io kernel math math.parser math.ranges
+USING: formatting io kernel math math.parser ranges

 namespaces random sequences strings ;
 IN: rosetta-code.number-reversal
 
 namespaces random sequences strings ;
 IN: rosetta-code.number-reversal
 

diff --git a/extra/rosetta-code/pascals-triangle/pascals-triangle.factor b/extra/rosetta-code/pascals-triangle/pascals-triangle.factor
index f1aa83ee546328865d09443511b1aa014bd4e3d6..e7ca9572966c6b19d7e655e4b4a7017bafd5bf9d 100644 (file)
--- a/extra/rosetta-code/pascals-triangle/pascals-triangle.factor
+++ b/extra/rosetta-code/pascals-triangle/pascals-triangle.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.

-USING: grouping kernel locals math math.ranges sequences ;
+USING: grouping kernel locals math ranges sequences ;

 IN: rosetta-code.pascals-triangle
 
 ! http://rosettacode.org/wiki/Pascal%27s_triangle
 IN: rosetta-code.pascals-triangle
 
 ! http://rosettacode.org/wiki/Pascal%27s_triangle

diff --git a/extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor b/extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor
index 054a2fca944a2844e7c870b22d781008f3858ca9..cfb2cdeb1936e0b19b8f68853792e17f6dd7584f 100644 (file)
--- a/extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor
+++ b/extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays formatting kernel literals math
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays formatting kernel literals math

-math.functions math.matrices math.ranges sequences ;
+math.functions math.matrices ranges sequences ;

 IN: rosetta-code.pythagorean-triples
 
 ! http://rosettacode.org/wiki/Pythagorean_triples
 IN: rosetta-code.pythagorean-triples
 
 ! http://rosettacode.org/wiki/Pythagorean_triples

diff --git a/extra/sequences/abbrev/abbrev.factor b/extra/sequences/abbrev/abbrev.factor
index 9aa6f341c0ea63fe266380bfc83be7044ae3a172..8cde6f42e5efe7de0e687ed04e1c376d9c19f54b 100644 (file)
--- a/extra/sequences/abbrev/abbrev.factor
+++ b/extra/sequences/abbrev/abbrev.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Maximilian Lupke.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2009 Maximilian Lupke.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: assocs kernel math.ranges sequences ;
+USING: assocs kernel ranges sequences ;

 IN: sequences.abbrev
 
 <PRIVATE
 IN: sequences.abbrev
 
 <PRIVATE

diff --git a/extra/sequences/extras/extras-docs.factor b/extra/sequences/extras/extras-docs.factor
index 64b9f1a36ae09daccb9dc9da2224daa68625ae2d..13844e9f9b801082ed8f75affbd6c9d5ab5dc2e0 100644 (file)
--- a/extra/sequences/extras/extras-docs.factor
+++ b/extra/sequences/extras/extras-docs.factor
@@ -75,7 +75,7 @@ HELP: count*
     { "quot" { $quotation ( ... elt -- ... ? ) } }
     { "%" rational } }
 { $description "Outputs the fraction of elements in the sequence for which the predicate quotation matches." }
     { "quot" { $quotation ( ... elt -- ... ? ) } }
     { "%" rational } }
 { $description "Outputs the fraction of elements in the sequence for which the predicate quotation matches." }

-{ $examples { $example "USING: math math.ranges prettyprint sequences.extras ;" "100 [1,b] [ even? ] count* ." "1/2" } } ;
+{ $examples { $example "USING: math ranges prettyprint sequences.extras ;" "100 [1,b] [ even? ] count* ." "1/2" } } ;

 
 HELP: collapse
 { $values
 
 HELP: collapse
 { $values

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 818e4ee6e16a3ddce25ca32fe20f519ad20ec0ff..9259b64a1dce7485f52d7af2a651bc99ab4e112c 100644 (file)
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -1,5 +1,5 @@
 USING: accessors arrays assocs combinators fry generalizations
 USING: accessors arrays assocs combinators fry generalizations

-grouping growable kernel locals make math math.order math.ranges
+grouping growable kernel locals make math math.order ranges

 sequences sequences.deep sequences.private shuffle sorting
 splitting vectors ;
 IN: sequences.extras
 sequences sequences.deep sequences.private shuffle sorting
 splitting vectors ;
 IN: sequences.extras

diff --git a/extra/sequences/n-based/n-based.factor b/extra/sequences/n-based/n-based.factor
index 4343bf2f9d8bed33e58cd8bc81ef8fd31fed43f5..084af7778619d3e147ba8b5e4eebda8133c975f7 100644 (file)
--- a/extra/sequences/n-based/n-based.factor
+++ b/extra/sequences/n-based/n-based.factor
@@ -1,5 +1,5 @@
 ! (c)2008 Joe Groff, see BSD license etc.
 ! (c)2008 Joe Groff, see BSD license etc.

-USING: accessors assocs kernel math math.ranges sequences
+USING: accessors assocs kernel math ranges sequences

 sequences.private ;
 IN: sequences.n-based
 
 sequences.private ;
 IN: sequences.n-based
 

diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor
index 8c80c4382af432ba18c48cf8e1ecfabe38f685ca..3eaa12e5eb6dade4012618ecac971eadfa947895 100644 (file)
--- a/extra/slides/slides.factor
+++ b/extra/slides/slides.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays colors fonts fry help.markup help.stylesheet
 ! Copyright (C) 2007, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays colors fonts fry help.markup help.stylesheet

-io.styles kernel literals math math.ranges models namespaces parser
+io.styles kernel literals math ranges models namespaces parser

 sequences system ui ui.gadgets ui.gadgets.books ui.gadgets.panes
 ui.gestures ui.pens.gradient ui.pens.solid ;
 IN: slides
 sequences system ui ui.gadgets ui.gadgets.books ui.gadgets.panes
 ui.gestures ui.pens.gradient ui.pens.solid ;
 IN: slides

diff --git a/extra/smalltalk/library/library.factor b/extra/smalltalk/library/library.factor
index df722f7b03553620c337dcdf011d318ab140e1ad..653600118d3894bc87a493c52fb5d79dbf193121 100644 (file)
--- a/extra/smalltalk/library/library.factor
+++ b/extra/smalltalk/library/library.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel present io math sequences assocs math.ranges
+USING: kernel present io math sequences assocs ranges

 math.order fry tools.time locals smalltalk.selectors
 smalltalk.ast smalltalk.classes ;
 IN: smalltalk.library
 math.order fry tools.time locals smalltalk.selectors
 smalltalk.ast smalltalk.classes ;
 IN: smalltalk.library

diff --git a/extra/sorting/bubble/bubble.factor b/extra/sorting/bubble/bubble.factor
index f74595aeeef75f50d9cbdb5b5aa9ab385a6aa730..e87a0c2afc61b5ad515c63447dd4b4d62a4b5db6 100644 (file)
--- a/extra/sorting/bubble/bubble.factor
+++ b/extra/sorting/bubble/bubble.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2014 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
 ! Copyright (C) 2014 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 

-USING: kernel locals math math.order math.ranges sequences
+USING: kernel locals math math.order ranges sequences

 sequences.private ;
 
 IN: sorting.bubble
 sequences.private ;
 
 IN: sorting.bubble

diff --git a/extra/spelling/spelling.factor b/extra/spelling/spelling.factor
index b4424d4afb732111e2f6c9dde669c9ddd4a4847b..ec8de5570bcd931cc3feb6e41f4708d220dfc235 100644 (file)
--- a/extra/spelling/spelling.factor
+++ b/extra/spelling/spelling.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 USING: arrays ascii assocs combinators combinators.smart fry
 http.client io.encodings.ascii io.files io.files.temp kernel
 ! See http://factorcode.org/license.txt for BSD license
 USING: arrays ascii assocs combinators combinators.smart fry
 http.client io.encodings.ascii io.files io.files.temp kernel

-locals math math.ranges math.statistics memoize sequences
+locals math ranges math.statistics memoize sequences

 sequences.private sorting splitting urls ;
 IN: spelling
 
 sequences.private sorting splitting urls ;
 IN: spelling
 

diff --git a/extra/synth/buffers/buffers.factor b/extra/synth/buffers/buffers.factor
index b1173356886f5342d6b85287728008a1a26843e3..885d66ef3dc76c213a997aaa28d5e0532d7201c3 100644 (file)
--- a/extra/synth/buffers/buffers.factor
+++ b/extra/synth/buffers/buffers.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien combinators kernel locals math
 ! Copyright (C) 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien combinators kernel locals math

-math.ranges openal sequences sequences.merged specialized-arrays ;
+ranges openal sequences sequences.merged specialized-arrays ;

 FROM: alien.c-types => short uchar ;
 SPECIALIZED-ARRAY: uchar
 SPECIALIZED-ARRAY: short
 FROM: alien.c-types => short uchar ;
 SPECIALIZED-ARRAY: uchar
 SPECIALIZED-ARRAY: short

diff --git a/extra/tensors/demos/demos.factor b/extra/tensors/demos/demos.factor
index 2192e2e139cb68028e910d7c6cebea45ef9e58f8..6d1ad9b5fb1d27597d4b215d9ce7619980d61bb6 100644 (file)
--- a/extra/tensors/demos/demos.factor
+++ b/extra/tensors/demos/demos.factor
@@ -3,7 +3,7 @@
 ! Code based on https://towardsdatascience.com/linear-regression-from-scratch-with-numpy-implementation-finally-8e617d8e274c
 
 USING: arrays accessors csv io io.encodings.utf8 kernel locals math math.parser
 ! Code based on https://towardsdatascience.com/linear-regression-from-scratch-with-numpy-implementation-finally-8e617d8e274c
 
 USING: arrays accessors csv io io.encodings.utf8 kernel locals math math.parser

-math.ranges math.statistics prettyprint sequences tensors ;
+ranges math.statistics prettyprint sequences tensors ;

 IN: tensors.demos
 
 <PRIVATE
 IN: tensors.demos
 
 <PRIVATE

diff --git a/extra/tensors/tensors.factor b/extra/tensors/tensors.factor
index 298caf68d5d930b65ed2997c00ac2df0cbdab078..142c1f8290f4ab1a4c088a9ba3aad9ddc194c6ec 100644 (file)
--- a/extra/tensors/tensors.factor
+++ b/extra/tensors/tensors.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 
 USING: accessors alien alien.c-types alien.data arrays byte-arrays combinators
 ! See http://factorcode.org/license.txt for BSD license.
 
 USING: accessors alien alien.c-types alien.data arrays byte-arrays combinators

-grouping kernel locals kernel.private math math.functions math.ranges math.vectors
+grouping kernel locals kernel.private math math.functions ranges math.vectors

 math.vectors.simd multi-methods parser prettyprint.custom sequences sequences.extras
 sequences.private specialized-arrays typed ;
 
 math.vectors.simd multi-methods parser prettyprint.custom sequences sequences.extras
 sequences.private specialized-arrays typed ;
 

diff --git a/extra/text-to-pdf/text-to-pdf.factor b/extra/text-to-pdf/text-to-pdf.factor
index 2b3d62b4d87e7e6f9c36ea947b76a6285ee9836c..76c1ee02992a49971ec6e19d8540b1946628b8dc 100644 (file)
--- a/extra/text-to-pdf/text-to-pdf.factor
+++ b/extra/text-to-pdf/text-to-pdf.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: assocs calendar combinators environment formatting
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: assocs calendar combinators environment formatting

-grouping io io.files kernel make math math.ranges sequences
+grouping io io.files kernel make math ranges sequences

 splitting xml.entities ;
 
 IN: text-to-pdf
 splitting xml.entities ;
 
 IN: text-to-pdf

diff --git a/extra/text-to-pdf/text-to-pdf.pdf b/extra/text-to-pdf/text-to-pdf.pdf
index c8e37487806e6b978548e94566ae0bb61e20870c..3520e4a31dc6fefe430db00b558110b2716dc6c6 100644 (file)
--- a/extra/text-to-pdf/text-to-pdf.pdf
+++ b/extra/text-to-pdf/text-to-pdf.pdf
@@ -49,7 +49,7 @@ BT
 (! See http://factorcode.org/license.txt for BSD license)'
 ( )'
 (USING: assocs calendar combinators environment formatting)'
 (! See http://factorcode.org/license.txt for BSD license)'
 ( )'
 (USING: assocs calendar combinators environment formatting)'

-(grouping io io.files kernel make math math.ranges sequences)'
+(grouping io io.files kernel make math ranges sequences)'

 (splitting xml.entities ;)'
 ( )'
 (IN: text-to-pdf)'
 (splitting xml.entities ;)'
 ( )'
 (IN: text-to-pdf)'

diff --git a/extra/tools/seq/seq.factor b/extra/tools/seq/seq.factor
index 4969a548796c92f0f25eda15088c844f36e66848..06079f7d083f8f2edefd78f99a266cf073c9d69d 100644 (file)
--- a/extra/tools/seq/seq.factor
+++ b/extra/tools/seq/seq.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: combinators command-line io kernel math.order math.parser
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: combinators command-line io kernel math.order math.parser

-math.ranges namespaces sequences ;
+ranges namespaces sequences ;

 
 IN: tools.seq
 
 
 IN: tools.seq
 

diff --git a/extra/trees/trees-tests.factor b/extra/trees/trees-tests.factor
index 6c4ed758500458ea47328f2a3d563c0a41e1f467..3ee169ba38f1255122322bbf238c8606e8ae25f0 100644 (file)
--- a/extra/trees/trees-tests.factor
+++ b/extra/trees/trees-tests.factor
@@ -1,5 +1,5 @@
 USING: accessors arrays assocs combinators fry kernel locals
 USING: accessors arrays assocs combinators fry kernel locals

-math math.combinatorics math.ranges namespaces random sequences
+math math.combinatorics ranges namespaces random sequences

 sequences.product tools.test trees trees.private ;
 IN: trees.tests
 
 sequences.product tools.test trees trees.private ;
 IN: trees.tests
 

diff --git a/extra/webapps/wee-url/wee-url.factor b/extra/webapps/wee-url/wee-url.factor
index ee3cd252bc152d9a9bee93eebc91be66b7078512..2076fb21583d98f4759e203b001fa02dafbfee92 100644 (file)
--- a/extra/webapps/wee-url/wee-url.factor
+++ b/extra/webapps/wee-url/wee-url.factor
@@ -3,7 +3,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors continuations db.tuples db.types fry furnace.actions
 furnace.boilerplate furnace.redirection furnace.utilities html.forms
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors continuations db.tuples db.types fry furnace.actions
 furnace.boilerplate furnace.redirection furnace.utilities html.forms

-http.server.dispatchers kernel math math.ranges random random.data
+http.server.dispatchers kernel math ranges random random.data

 sequences urls validators ;
 IN: webapps.wee-url
 
 sequences urls validators ;
 IN: webapps.wee-url
 

diff --git a/extra/websites/factorcode/examples.txt b/extra/websites/factorcode/examples.txt
index b9be294da66fdc28b9aa5a23354e4b4589905da7..3d78df1a66ba550e81bf024dd41e761f0a68f95d 100644 (file)
--- a/extra/websites/factorcode/examples.txt
+++ b/extra/websites/factorcode/examples.txt
@@ -87,7 +87,7 @@ ascii file-lines { "%" } split random
 [ print ] each
 ----
 USING: combinators io kernel locals
 [ print ] each
 ----
 USING: combinators io kernel locals

-math.functions math.parser math.ranges
+math.functions math.parser ranges

 sequences ;
 
 100 [1,b] [| i |
 sequences ;
 
 100 [1,b] [| i |

diff --git a/extra/z-algorithm/z-algorithm.factor b/extra/z-algorithm/z-algorithm.factor
index e7dd51542a6f6bca219e1cc10c2e0a9e2dac20dc..b06b4d912710f8df3392d3aee1564caa3814d719 100644 (file)
--- a/extra/z-algorithm/z-algorithm.factor
+++ b/extra/z-algorithm/z-algorithm.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2010 Dmitry Shubin.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2010 Dmitry Shubin.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays kernel locals math math.ranges sequences
+USING: arrays kernel locals math ranges sequences

 sequences.private ;
 IN: z-algorithm
 
 sequences.private ;
 IN: z-algorithm