Updating extra/ modules

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

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

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> [

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 ;

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

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

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

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
 

extra/openal/macosx/macosx.factor

@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 !
 IN: openal.macosx
-USING: openal alien.c-types kernel alien alien.syntax shuffle ;
+USING: openal alien.c-types kernel alien alien.syntax shuffle
+combinators.lib ;
 
 LIBRARY: alut
 

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? ;

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: