Updating extra/ modules

diff --git a/core/optimizer/debugger/debugger.factor b/core/optimizer/debugger/debugger.factor
index 6c323fce1eaa01752655272901c35dc3c2adad8f..ed0358fe7f30aae681e465dd4e2e53c32d29c8ae 100644 (file)
--- a/core/optimizer/debugger/debugger.factor
+++ b/core/optimizer/debugger/debugger.factor
@@ -3,7 +3,7 @@
 USING: classes inference inference.dataflow io kernel
 kernel.private math.parser namespaces optimizer prettyprint
 prettyprint.backend sequences words arrays match macros
-assocs ;
+assocs combinators.private ;
 IN: optimizer.debugger
 
 ! A simple tool for turning dataflow IR into quotations, for

diff --git a/extra/benchmark/dispatch4/dispatch4.factor b/extra/benchmark/dispatch4/dispatch4.factor
index 3ad41337d55f68ff86ef1eb20b0cfac69e94013e..a5bb9831511e0658a96fe8cd3d56f156ec1d4a6e 100644 (file)
--- a/extra/benchmark/dispatch4/dispatch4.factor
+++ b/extra/benchmark/dispatch4/dispatch4.factor
@@ -1,4 +1,5 @@
-USING: kernel.private kernel sequences math combinators ;
+USING: kernel.private kernel sequences math combinators
+combinators.private ;
 IN: benchmark.dispatch4
 
 : foobar-1

diff --git a/extra/channels/sniffer/bsd/bsd.factor b/extra/channels/sniffer/bsd/bsd.factor
index dd72279e4b4d6a1c18a4b20dbd44df9dd01cba81..ba8e5ceeb99a572544dd73caf266710e5794562d 100644 (file)
--- a/extra/channels/sniffer/bsd/bsd.factor
+++ b/extra/channels/sniffer/bsd/bsd.factor
@@ -3,7 +3,7 @@
 !
 ! Wrap a sniffer in a channel
 USING: kernel channels channels.sniffer concurrency io
-io.sniffer io.sniffer.bsd ;
+io.sniffer io.sniffer.bsd io.unix.backend ;
 
 M: unix-io sniff-channel ( -- channel ) 
   "/dev/bpf0" "en1" <sniffer-spec> <sniffer> <channel> [

diff --git a/extra/cpu/8080/8080.factor b/extra/cpu/8080/8080.factor
index 34666b3288d9e5d3515231b3c110f9b3a4c4bd57..87c3a235fd5f080113436db5177f43f570d387c0 100644 (file)
--- a/extra/cpu/8080/8080.factor
+++ b/extra/cpu/8080/8080.factor
@@ -3,7 +3,8 @@
 !
 USING: kernel math sequences words arrays io 
        io.files namespaces math.parser kernel.private
-       assocs quotations parser parser-combinators tools.time ;
+       assocs quotations parser parser-combinators tools.time
+       combinators.private ;
 IN: cpu.8080
 
 TUPLE: cpu b c d e f h l a pc sp halted? last-interrupt cycles ram ;

diff --git a/extra/icfp/2006/2006.factor b/extra/icfp/2006/2006.factor
index 317a5ae83b50c892fdc78b028515f91d9a93df53..2b42cddc6a28585a75d15e556c4792c14128ef1a 100644 (file)
--- a/extra/icfp/2006/2006.factor
+++ b/extra/icfp/2006/2006.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 
 USING: kernel math sequences kernel.private namespaces arrays
-io io.files splitting io.binary math.functions vectors ;
+io io.files splitting io.binary math.functions vectors
+quotations combinators.private ;
 IN: universal-machine
 
 SYMBOL: regs

diff --git a/extra/io/sniffer/filter/bsd/bsd.factor b/extra/io/sniffer/filter/bsd/bsd.factor
index c986a096641a8e4f483b9aa35d0889a2e2a9ba5f..fc34b3448bd53633aa2470b30209eafeefc515e5 100644 (file)
--- a/extra/io/sniffer/filter/bsd/bsd.factor
+++ b/extra/io/sniffer/filter/bsd/bsd.factor
@@ -1,7 +1,7 @@
 USING: alien.c-types hexdump io io.backend io.sockets.headers
 io.sockets.headers.bsd kernel io.sniffer io.sniffer.bsd
 io.sniffer.filter io.streams.string io.unix.backend math
-sequences system ;
+sequences system byte-arrays ;
 IN: io.sniffer.filter.bsd
 
 ! http://www.iana.org/assignments/ethernet-numbers

diff --git a/extra/io/streams/null/null.factor b/extra/io/streams/null/null.factor
index 7c1113039768c9665a65702445e9c989cc20f8b5..12a36091ce510aee68f513de2cd50b9eab9fa6af 100644 (file)
--- a/extra/io/streams/null/null.factor
+++ b/extra/io/streams/null/null.factor
@@ -16,7 +16,10 @@ M: null-stream stream-write 2drop ;
 M: null-stream stream-nl drop ;
 M: null-stream stream-flush drop ;
 M: null-stream stream-format 3drop ;
-M: null-stream with-nested-stream rot drop with-stream* ;
+M: null-stream make-span-stream nip ;
+M: null-stream make-block-stream nip ;
+M: null-stream make-cell-stream nip ;
+M: null-stream stream-write-table 3drop ;
 
 : with-null-stream ( quot -- )
     T{ null-stream } swap with-stream* ; inline

diff --git a/extra/locals/locals.factor b/extra/locals/locals.factor
index ca157fa2a7c30feebf1e31942c7ffabc323e5a16..688507be78492e45ce593359aa35cf7ad0658262 100644 (file)
--- a/extra/locals/locals.factor
+++ b/extra/locals/locals.factor
@@ -4,7 +4,8 @@
 USING: kernel namespaces sequences sequences.private assocs
        math inference.transforms parser words quotations debugger
        macros arrays macros splitting combinators prettyprint.backend
-       definitions prettyprint hashtables combinators.lib ;
+       definitions prettyprint hashtables combinators.lib
+       prettyprint.sections ;
 
 IN: locals
 

diff --git a/extra/openal/macosx/macosx.factor b/extra/openal/macosx/macosx.factor
index 21c918e33ea997b8c2cb6505873dc043b45a3b00..77484aca74430fcd979502c9985361419aee84b9 100644 (file)
--- a/extra/openal/macosx/macosx.factor
+++ b/extra/openal/macosx/macosx.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.\r
 !\r
 IN: openal.macosx\r
-USING: openal alien.c-types kernel alien alien.syntax shuffle ;\r
+USING: openal alien.c-types kernel alien alien.syntax shuffle\r
+combinators.lib ;\r
 \r
 LIBRARY: alut\r
 \r

diff --git a/extra/space-invaders/space-invaders.factor b/extra/space-invaders/space-invaders.factor
index 287e6eebb8c496bab583084e2a8584300264f103..3f695a4f60562e5ff017f12b3f9ed8bcf6468a83 100644 (file)
--- a/extra/space-invaders/space-invaders.factor
+++ b/extra/space-invaders/space-invaders.factor
@@ -4,7 +4,8 @@
 USING: cpu.8080 openal math alien.c-types sequences kernel
        shuffle arrays io.files combinators kernel.private
        ui.gestures ui.gadgets ui.render opengl.gl system 
-       threads concurrency match ui byte-arrays combinators.lib ;
+       threads concurrency match ui byte-arrays combinators.lib
+       combinators.private ;
 IN: space-invaders
 
 TUPLE: space-invaders port1 port2i port2o port3o port4lo port4hi port5o bitmap sounds looping? ;

diff --git a/extra/state-machine/state-machine.factor b/extra/state-machine/state-machine.factor
index 671150b10a13f61c43d1ddeb79db744e2e457f4e..85f4812d9ad5e0b364f164b680d17bc17ad1bdb6 100644 (file)
--- a/extra/state-machine/state-machine.factor
+++ b/extra/state-machine/state-machine.factor
@@ -1,5 +1,5 @@
-USING: kernel parser strings math namespaces sequences words io arrays 
-quotations debugger kernel.private ;
+USING: kernel parser strings math namespaces sequences words io
+arrays quotations debugger kernel.private combinators.private ;
 IN: state-machine
 
 : STATES: