combinators.cleave is now core

core/kernel/kernel.factor

@@ -1,4 +1,4 @@
-! Copyright (C) 2004, 2007 Slava Pestov.
+! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel.private ;
 IN: kernel
@@ -27,24 +27,28 @@ DEFER: if
 
 : if ( ? true false -- ) ? call ;
 
-: if* ( cond true false -- )
+! Single branch
-    pick [ drop call ] [ 2nip call ] if ; inline
-
-: ?if ( default cond true false -- )
-    pick [ roll 2drop call ] [ 2nip call ] if ; inline
-
 : unless ( cond false -- )
     swap [ drop ] [ call ] if ; inline
 
-: unless* ( cond false -- )
-    over [ drop ] [ nip call ] if ; inline
-
 : when ( cond true -- )
     swap [ call ] [ drop ] if ; inline
 
+! Anaphoric
+: if* ( cond true false -- )
+    pick [ drop call ] [ 2nip call ] if ; inline
+
 : when* ( cond true -- )
     over [ call ] [ 2drop ] if ; inline
 
+: unless* ( cond false -- )
+    over [ drop ] [ nip call ] if ; inline
+
+! Default
+: ?if ( default cond true false -- )
+    pick [ roll 2drop call ] [ 2nip call ] if ; inline
+
+! Slippers
 : slip ( quot x -- x ) >r call r> ; inline
 
 : 2slip ( quot x y -- x y ) >r >r call r> r> ; inline
@@ -53,6 +57,7 @@ DEFER: if
 
 : dip ( obj quot -- obj ) swap slip ; inline
 
+! Keepers
 : keep ( x quot -- x ) over slip ; inline
 
 : 2keep ( x y quot -- x y ) 2over 2slip ; inline
@@ -60,7 +65,48 @@ DEFER: if
 : 3keep ( x y z quot -- x y z )
     >r 3dup r> -roll 3slip ; inline
 
-: 2apply ( x y quot -- ) tuck 2slip call ; inline
+! Cleavers
+: bi ( x p q -- p[x] q[x] )
+    >r keep r> call ; inline
+
+: tri ( x p q r -- p[x] q[x] r[x] )
+    >r pick >r bi r> r> call ; inline
+
+! Double cleavers
+: 2bi ( x y p q -- p[x,y] q[x,y] )
+    >r 2keep r> call ; inline
+
+: 2tri ( x y p q r -- p[x,y] q[x,y] r[x,y] )
+    >r >r 2keep r> 2keep r> call ; inline
+
+! Triple cleavers
+: 3bi ( x y z p q -- p[x,y,z] q[x,y,z] )
+    >r 3keep r> call ; inline
+
+: 3tri ( x y z p q r -- p[x,y,z] q[x,y,z] r[x,y,z] )
+    >r >r 3keep r> 3keep r> call ; inline
+
+! Spreaders
+: bi* ( x y p q -- p[x] q[y] )
+    >r swap slip r> call ; inline
+
+: tri* ( x y z p q r -- p[x] q[y] r[z] )
+    >r rot >r bi* r> r> call ; inline
+
+! Double spreaders
+: 2bi* ( w x y z p q -- p[w,x] q[y,z] )
+    >r -rot 2slip r> call ; inline
+
+! Appliers
+: bi@ ( x y p -- p[x] p[y] )
+    tuck 2slip call ; inline
+
+: tri@ ( x y z p -- p[x] p[y] p[z] )
+    tuck >r bi@ r> call ; inline
+
+! Double appliers
+: 2bi@ ( w x y z p -- p[w,x] p[y,z] )
+    dup -roll 3slip call ; inline
 
 : while ( pred body tail -- )
     >r >r dup slip r> r> roll
@@ -135,11 +181,11 @@ USE: tuples.private
 
 : xor ( obj1 obj2 -- ? ) dup not swap ? ; inline
 
-: both? ( x y quot -- ? ) 2apply and ; inline
+: both? ( x y quot -- ? ) bi@ and ; inline
 
-: either? ( x y quot -- ? ) 2apply or ; inline
+: either? ( x y quot -- ? ) bi@ or ; inline
 
-: compare ( obj1 obj2 quot -- n ) 2apply <=> ; inline
+: compare ( obj1 obj2 quot -- n ) bi@ <=> ; inline
 
 : most ( x y quot -- z )
     >r 2dup r> call [ drop ] [ nip ] if ; inline
@@ -155,3 +201,6 @@ USE: tuples.private
 : do-primitive ( number -- ) "Improper primitive call" throw ;
 
 PRIVATE>
+
+! Deprecated
+: 2apply bi@ ; inline

extra/benchmark/benchmark.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel vocabs vocabs.loader tools.time tools.vocabs
 arrays assocs io.styles io help.markup prettyprint sequences
-continuations debugger combinators.cleave ;
+continuations debugger ;
 IN: benchmark
 
 : run-benchmark ( vocab -- result )

extra/boids/boids.factor

@@ -6,7 +6,6 @@ USING: kernel namespaces
        math.vectors
        math.trig
        combinators arrays sequences random vars
-       combinators.cleave
        combinators.lib ;
 
 IN: boids

extra/boids/ui/ui.factor

@@ -19,7 +19,6 @@ USING: kernel namespaces
        ui.gadgets.packs
        ui.gadgets.grids
        ui.gestures
-       combinators.cleave
        assocs.lib vars rewrite-closures boids ;
 
 IN: boids.ui

extra/bunny/bunny.factor

@@ -1,11 +1,10 @@
-USING: alien alien.c-types arrays sequences math
+USING: alien alien.c-types arrays sequences math math.vectors
-math.vectors math.matrices math.parser io io.files kernel opengl
+math.matrices math.parser io io.files kernel opengl opengl.gl
-opengl.gl opengl.glu shuffle http.client vectors
+opengl.glu shuffle http.client vectors namespaces ui.gadgets
-namespaces ui.gadgets ui.gadgets.canvas ui.render ui splitting
+ui.gadgets.canvas ui.render ui splitting combinators tools.time
-combinators tools.time system combinators.lib combinators.cleave
+system combinators.lib float-arrays continuations
-float-arrays continuations opengl.demo-support multiline
+opengl.demo-support multiline ui.gestures bunny.fixed-pipeline
-ui.gestures
+bunny.cel-shaded bunny.outlined bunny.model ;
-bunny.fixed-pipeline bunny.cel-shaded bunny.outlined bunny.model ;
 IN: bunny
 
 TUPLE: bunny-gadget model geom draw-seq draw-n ;

extra/bunny/model/model.factor

@@ -1,8 +1,8 @@
-USING: alien alien.c-types arrays sequences math math.vectors math.matrices
+USING: alien alien.c-types arrays sequences math math.vectors
-    math.parser io io.files kernel opengl opengl.gl opengl.glu io.encodings.ascii
+math.matrices math.parser io io.files kernel opengl opengl.gl
-    opengl.capabilities shuffle http.client vectors splitting tools.time system
+opengl.glu io.encodings.ascii opengl.capabilities shuffle
-    combinators combinators.cleave float-arrays continuations namespaces
+http.client vectors splitting tools.time system combinators
-    sequences.lib ;
+float-arrays continuations namespaces sequences.lib ;
 IN: bunny.model
 
 : numbers ( str -- seq )

extra/bunny/outlined/outlined.factor

@@ -1,7 +1,6 @@
-USING: arrays bunny.model bunny.cel-shaded
+USING: arrays bunny.model bunny.cel-shaded continuations kernel
-combinators.cleave continuations kernel math multiline
+math multiline opengl opengl.shaders opengl.framebuffers
-opengl opengl.shaders opengl.framebuffers opengl.gl
+opengl.gl opengl.capabilities sequences ui.gadgets ;
-opengl.capabilities sequences ui.gadgets combinators.cleave ;
 IN: bunny.outlined
 
 STRING: outlined-pass1-fragment-shader-main-source

extra/cairo/lib/lib.factor

@@ -1,8 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types cairo.ffi continuations destructors
-kernel libc locals math combinators.cleave shuffle
+kernel libc locals math shuffle accessors ;
-accessors ;
 IN: cairo.lib
 
 TUPLE: cairo-t alien ;

extra/cairo/png/png.factor

@@ -1,8 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators.cleave kernel
+USING: arrays kernel accessors math ui.gadgets ui.render
-accessors math ui.gadgets ui.render opengl.gl byte-arrays
+opengl.gl byte-arrays namespaces opengl cairo.ffi cairo.lib ;
-namespaces opengl cairo.ffi cairo.lib ;
 IN: cairo.png
 
 TUPLE: png surface width height cairo-t array ;

extra/calendar/format/format.factor

@@ -1,6 +1,5 @@
 USING: math math.parser kernel sequences io calendar
-accessors arrays io.streams.string combinators accessors
+accessors arrays io.streams.string combinators accessors ;
-combinators.cleave ;
 IN: calendar.format
 
 GENERIC: day. ( obj -- )

extra/calendar/windows/windows.factor

@@ -1,6 +1,5 @@
 USING: calendar.backend namespaces alien.c-types
-windows windows.kernel32 kernel math combinators.cleave
+windows windows.kernel32 kernel math combinators ;
-combinators ;
 IN: calendar.windows
 
 TUPLE: windows-calendar ;

extra/cfdg/cfdg.factor

@@ -3,7 +3,7 @@ USING: kernel alien.c-types combinators namespaces arrays
        sequences sequences.lib namespaces.lib splitting
        math math.functions math.vectors math.trig
        opengl.gl opengl.glu opengl ui ui.gadgets.slate
-       combinators.cleave vars
+       vars
        random-weighted colors.hsv cfdg.gl ;
 
 IN: cfdg

extra/colors/hsv/hsv.factor

@@ -1,8 +1,7 @@
 ! Copyright (C) 2007 Eduardo Cavazos
 ! See http://factorcode.org/license.txt for BSD license.
 
-USING: kernel combinators arrays sequences math math.functions
+USING: kernel combinators arrays sequences math math.functions ;
-       combinators.cleave ;
 
 IN: colors.hsv
 

extra/combinators/lib/lib.factor

@@ -4,8 +4,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel combinators fry namespaces quotations hashtables
 sequences assocs arrays inference effects math math.ranges
-arrays.lib shuffle macros bake combinators.cleave
+arrays.lib shuffle macros bake continuations ;
-continuations ;
 
 IN: combinators.lib
 

extra/concurrency/distributed/distributed.factor

@@ -1,8 +1,7 @@
 ! Copyright (C) 2005 Chris Double. All Rights Reserved.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: serialize sequences concurrency.messaging
+USING: serialize sequences concurrency.messaging threads io
-threads io io.server qualified arrays
+io.server qualified arrays namespaces kernel io.encodings.binary
-namespaces kernel io.encodings.binary combinators.cleave
 accessors ;
 QUALIFIED: io.sockets
 IN: concurrency.distributed

extra/db/postgresql/lib/lib.factor

@@ -2,10 +2,10 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays continuations db io kernel math namespaces
 quotations sequences db.postgresql.ffi alien alien.c-types
-db.types tools.walker ascii splitting math.parser
+db.types tools.walker ascii splitting math.parser combinators
-combinators combinators.cleave libc shuffle calendar.format
+libc shuffle calendar.format byte-arrays destructors prettyprint
-byte-arrays destructors prettyprint accessors
+accessors strings serialize io.encodings.binary
-strings serialize io.encodings.binary io.streams.byte-array ;
+io.streams.byte-array ;
 IN: db.postgresql.lib
 
 : postgresql-result-error-message ( res -- str/f )

extra/db/postgresql/postgresql.factor

@@ -5,7 +5,7 @@ kernel math math.parser namespaces prettyprint quotations
 sequences debugger db db.postgresql.lib db.postgresql.ffi
 db.tuples db.types tools.annotations math.ranges
 combinators sequences.lib classes locals words tools.walker
-combinators.cleave namespaces.lib ;
+namespaces.lib ;
 IN: db.postgresql
 
 TUPLE: postgresql-db host port pgopts pgtty db user pass ;

extra/db/sqlite/sqlite.factor

@@ -5,7 +5,7 @@ hashtables io.files kernel math math.parser namespaces
 prettyprint sequences strings tuples alien.c-types
 continuations db.sqlite.lib db.sqlite.ffi db.tuples
 words combinators.lib db.types combinators
-combinators.cleave io namespaces.lib ;
+io namespaces.lib ;
 USE: tools.walker
 IN: db.sqlite
 

extra/db/tuples/tuples.factor

@@ -3,8 +3,7 @@
 USING: arrays assocs classes db kernel namespaces
 tuples words sequences slots math
 math.parser io prettyprint db.types continuations
-mirrors sequences.lib tools.walker combinators.lib
+mirrors sequences.lib tools.walker combinators.lib ;
-combinators.cleave ;
 IN: db.tuples
 
 : define-persistent ( class table columns -- )

extra/http/http.factor

@@ -4,8 +4,7 @@ USING: fry hashtables io io.streams.string kernel math
 namespaces math.parser assocs sequences strings splitting ascii
 io.encodings.utf8 io.encodings.string namespaces unicode.case
 combinators vectors sorting accessors calendar
-calendar.format quotations arrays combinators.cleave
+calendar.format quotations arrays combinators.lib byte-arrays ;
-combinators.lib byte-arrays ;
 IN: http
 
 : http-port 80 ; inline

extra/http/server/actions/actions.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors sequences kernel assocs combinators
 http.server http.server.validators http hashtables namespaces
-combinators.cleave fry continuations locals ;
+fry continuations locals ;
 IN: http.server.actions
 
 SYMBOL: +append-path

extra/http/server/auth/login/login.factor

@@ -6,8 +6,8 @@ http.server.auth.providers http.server.auth.providers.null
 http.server.actions http.server.components http.server.sessions
 http.server.templating.fhtml http.server.validators
 http.server.auth http sequences io.files namespaces hashtables
-fry io.sockets combinators.cleave arrays threads locals
+fry io.sockets arrays threads locals qualified continuations
-qualified continuations destructors ;
+destructors ;
 IN: http.server.auth.login
 QUALIFIED: smtp
 

extra/http/server/callbacks/callbacks.factor

@@ -3,8 +3,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: html http http.server io kernel math namespaces
 continuations calendar sequences assocs hashtables
-accessors arrays alarms quotations combinators
+accessors arrays alarms quotations combinators fry assocs.lib ;
-combinators.cleave fry assocs.lib ;
 IN: http.server.callbacks
 
 SYMBOL: responder

extra/http/server/components/components.factor

@@ -4,7 +4,7 @@ USING: html.elements http.server.validators accessors
 namespaces kernel io math.parser assocs classes words tuples
 arrays sequences io.files http.server.templating.fhtml
 http.server.actions splitting mirrors hashtables
-combinators.cleave fry continuations math ;
+fry continuations math ;
 IN: http.server.components
 
 SYMBOL: components

extra/http/server/db/db.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: db http.server kernel accessors
-continuations namespaces destructors combinators.cleave ;
+continuations namespaces destructors ;
 IN: http.server.db
 
 TUPLE: db-persistence responder db params ;

extra/http/server/server.factor

@@ -4,7 +4,7 @@ USING: assocs kernel namespaces io io.timeouts strings splitting
 threads http sequences prettyprint io.server logging calendar
 html.elements accessors math.parser combinators.lib
 tools.vocabs debugger html continuations random combinators
-destructors io.encodings.8-bit fry combinators.cleave ;
+destructors io.encodings.8-bit fry ;
 IN: http.server
 
 GENERIC: call-responder ( path responder -- response )

extra/http/server/sessions/sessions.factor

@@ -3,8 +3,8 @@
 USING: assocs calendar kernel math.parser namespaces random
 accessors http http.server
 http.server.sessions.storage http.server.sessions.storage.assoc
-quotations hashtables sequences fry combinators.cleave
+quotations hashtables sequences fry html.elements symbols
-html.elements symbols continuations destructors ;
+continuations destructors ;
 IN: http.server.sessions
 
 ! ! ! ! ! !

extra/http/server/sessions/storage/assoc/assoc.factor

@@ -1,8 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs assocs.lib accessors
+USING: assocs assocs.lib accessors http.server.sessions.storage
-http.server.sessions.storage combinators.cleave alarms kernel
+alarms kernel fry http.server ;
-fry http.server ;
 IN: http.server.sessions.storage.assoc
 
 TUPLE: sessions-in-memory sessions alarms ;

extra/http/server/sessions/storage/db/db.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs accessors http.server.sessions.storage
 alarms kernel http.server db.tuples db.types singleton
-combinators.cleave math.parser ;
+math.parser ;
 IN: http.server.sessions.storage.db
 
 SINGLETON: sessions-in-db

extra/http/server/static/static.factor

@@ -3,8 +3,7 @@
 USING: calendar html io io.files kernel math math.parser http
 http.server namespaces parser sequences strings assocs
 hashtables debugger http.mime sorting html.elements logging
-calendar.format accessors io.encodings.binary
+calendar.format accessors io.encodings.binary fry ;
-combinators.cleave fry ;
 IN: http.server.static
 
 ! special maps mime types to quots with effect ( path -- )

extra/http/server/validators/validators.factor

@@ -1,8 +1,7 @@
 ! Copyright (C) 2006, 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel continuations sequences math namespaces
-math.parser assocs regexp fry unicode.categories
+math.parser assocs regexp fry unicode.categories sequences ;
-combinators.cleave sequences ;
 IN: http.server.validators
 
 SYMBOL: validation-failed?

extra/io/encodings/8-bit/8-bit.factor

@@ -1,9 +1,8 @@
 ! Copyright (C) 2008 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: math.parser arrays io.encodings sequences kernel
+USING: math.parser arrays io.encodings sequences kernel assocs
-assocs hashtables io.encodings.ascii combinators.cleave
+hashtables io.encodings.ascii generic parser tuples words io
-generic parser tuples words io io.files splitting namespaces
+io.files splitting namespaces math compiler.units accessors ;
-math compiler.units accessors ;
 IN: io.encodings.8-bit
 
 <PRIVATE

extra/io/unix/files/files.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.backend io.nonblocking io.unix.backend io.files io
 unix unix.stat unix.time kernel math continuations
-math.bitfields byte-arrays alien combinators combinators.cleave
+math.bitfields byte-arrays alien combinators calendar
-calendar io.encodings.binary ;
+io.encodings.binary ;
 
 IN: io.unix.files
 

extra/io/windows/files/files.factor

@@ -1,10 +1,9 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.c-types io.backend io.files io.windows kernel
+USING: alien.c-types io.backend io.files io.windows kernel math
-math windows windows.kernel32 combinators.cleave
+windows windows.kernel32 windows.time calendar combinators
-windows.time calendar combinators math.functions
+math.functions sequences namespaces words symbols
-sequences namespaces words symbols combinators.lib
+combinators.lib io.nonblocking destructors ;
-io.nonblocking destructors ;
 IN: io.windows.files
 
 SYMBOLS: +read-only+ +hidden+ +system+

extra/io/windows/nt/files/files.factor

@@ -2,8 +2,7 @@ USING: continuations destructors io.buffers io.files io.backend
 io.timeouts io.nonblocking io.windows io.windows.nt.backend
 kernel libc math threads windows windows.kernel32
 alien.c-types alien.arrays sequences combinators combinators.lib
-sequences.lib ascii splitting alien strings assocs
+sequences.lib ascii splitting alien strings assocs namespaces ;
-combinators.cleave namespaces ;
 IN: io.windows.nt.files
 
 M: windows-nt-io cwd

extra/locals/locals.factor

@@ -5,7 +5,7 @@ inference.transforms parser words quotations debugger macros
 arrays macros splitting combinators prettyprint.backend
 definitions prettyprint hashtables combinators.lib
 prettyprint.sections sequences.private effects generic
-compiler.units combinators.cleave accessors ;
+compiler.units accessors ;
 IN: locals
 
 ! Inspired by

extra/lsys/strings/interpret/interpret.factor

@@ -1,6 +1,6 @@
 
 USING: kernel sequences quotations assocs math math.parser
-       combinators.cleave combinators.lib vars lsys.strings ;
+       combinators.lib vars lsys.strings ;
 
 IN: lsys.strings.interpret
 

extra/lsys/strings/rewrite/rewrite.factor

@@ -1,6 +1,6 @@
 
 USING: kernel sbufs strings sequences assocs math
-       combinators.cleave combinators.lib vars lsys.strings ;
+       combinators.lib vars lsys.strings ;
 
 IN: lsys.strings.rewrite
 

extra/lsys/strings/strings.factor

@@ -1,5 +1,5 @@
 
-USING: kernel sequences math combinators.cleave combinators.lib ;
+USING: kernel sequences math combinators.lib ;
 
 IN: lsys.strings
 

extra/math/analysis/analysis.factor

@@ -1,5 +1,5 @@
 USING: kernel math math.constants math.functions math.intervals
-math.vectors namespaces sequences combinators.cleave ;
+math.vectors namespaces sequences ;
 IN: math.analysis
 
 <PRIVATE

extra/math/matrices/matrices.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel sequences math math.functions
-math.vectors combinators.cleave ;
+math.vectors ;
 IN: math.matrices
 
 ! Matrices

extra/opengl/demo-support/demo-support.factor

@@ -1,5 +1,5 @@
 USING: arrays combinators.lib kernel math math.functions math.vectors namespaces
-       opengl opengl.gl sequences ui ui.gadgets ui.gestures ui.render combinators.cleave ;
+       opengl opengl.gl sequences ui ui.gadgets ui.gestures ui.render ;
 IN: opengl.demo-support
 
 : NEAR-PLANE 1.0 64.0 / ; inline

extra/opengl/shaders/shaders.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel opengl.gl alien.c-types continuations namespaces
 assocs alien libc opengl math sequences combinators.lib 
-combinators.cleave macros arrays ;
+macros arrays ;
 IN: opengl.shaders
 
 : with-gl-shader-source-ptr ( string quot -- )

extra/project-euler/039/039.factor

@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators.cleave combinators.lib kernel math math.ranges
+USING: arrays combinators.lib kernel math math.ranges
     namespaces project-euler.common sequences ;
 IN: project-euler.039
 

extra/project-euler/075/075.factor

@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators.cleave combinators.lib kernel math math.ranges
+USING: arrays combinators.lib kernel math math.ranges
     namespaces project-euler.common sequences sequences.lib ;
 IN: project-euler.075
 

extra/random-weighted/random-weighted.factor

@@ -1,6 +1,6 @@
 
 USING: kernel namespaces arrays quotations sequences assocs combinators
-       mirrors math math.vectors random combinators.cleave macros bake ;
+       mirrors math math.vectors random macros bake ;
 
 IN: random-weighted
 

extra/random/blum-blum-shub/blum-blum-shub.factor

@@ -1,5 +1,5 @@
 USING: kernel math sequences namespaces
-math.miller-rabin combinators.cleave combinators.lib
+math.miller-rabin combinators.lib
 math.functions accessors random ;
 IN: random.blum-blum-shub
 

extra/random/mersenne-twister/mersenne-twister.factor

@@ -4,8 +4,7 @@
 ! http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
 
 USING: arrays kernel math namespaces sequences system init
-accessors math.ranges combinators.cleave new-effects
+accessors math.ranges new-effects random.backend ;
-random.backend ;
 IN: random.mersenne-twister
 
 <PRIVATE

extra/raptor/cron/cron.factor

@@ -1,6 +1,6 @@
 
 USING: kernel namespaces threads sequences calendar
-       combinators.cleave combinators.lib debugger ;
+       combinators.lib debugger ;
 
 IN: raptor.cron
 

extra/raptor/cronjobs.factor

@@ -1,5 +1,5 @@
 
-USING: kernel namespaces threads arrays sequences combinators.cleave
+USING: kernel namespaces threads arrays sequences
        raptor raptor.cron ;
 
 IN: raptor

extra/raptor/raptor.factor

@@ -1,6 +1,5 @@
 
-USING: kernel parser namespaces threads arrays sequences unix unix.process
+USING: kernel parser namespaces threads arrays sequences unix unix.process bake ;
-       combinators.cleave bake ;
 
 IN: raptor
 

extra/reports/noise/noise.factor

@@ -1,7 +1,7 @@
 USING: assocs math kernel shuffle combinators.lib
 words quotations arrays combinators sequences math.vectors
-io.styles combinators.cleave prettyprint vocabs sorting io
+io.styles prettyprint vocabs sorting io generic locals.private
-generic locals.private math.statistics ;
+math.statistics ;
 IN: reports.noise
 
 : badness ( word -- n )

extra/reports/optimizer/optimizer.factor

@@ -1,6 +1,6 @@
 USING: assocs words sequences arrays compiler tools.time
 io.styles io prettyprint vocabs kernel sorting generator
-optimizer math combinators.cleave ;
+optimizer math ;
 IN: report.optimizer
 
 : count-optimization-passes ( nodes n -- n )

extra/serialize/serialize.factor

@@ -11,8 +11,8 @@ io.binary strings classes words sbufs tuples arrays vectors
 byte-arrays bit-arrays quotations hashtables assocs help.syntax
 help.markup float-arrays splitting io.streams.byte-array
 io.encodings.string io.encodings.utf8 io.encodings.binary
-combinators combinators.cleave accessors locals
+combinators accessors locals prettyprint compiler.units
-prettyprint compiler.units sequences.private tuples.private ;
+sequences.private tuples.private ;
 IN: serialize
 
 ! Variable holding a assoc of objects already serialized

extra/springies/springies.factor

@@ -1,6 +1,6 @@
 
 USING: kernel combinators sequences arrays math math.vectors
-       combinators.cleave shuffle vars ;
+       shuffle vars ;
 
 IN: springies
 

extra/springies/ui/ui.factor

@@ -1,5 +1,5 @@
 
-USING: kernel namespaces threads sequences math math.vectors combinators.cleave
+USING: kernel namespaces threads sequences math math.vectors
        opengl.gl opengl colors ui ui.gadgets ui.gadgets.slate
        bake rewrite-closures vars springies ;
 

extra/tools/walker/walker.factor

@@ -3,7 +3,7 @@
 USING: threads kernel namespaces continuations combinators
 sequences math namespaces.private continuations.private
 concurrency.messaging quotations kernel.private words
-sequences.private assocs models combinators.cleave ;
+sequences.private assocs models ;
 IN: tools.walker
 
 SYMBOL: show-walker-hook ! ( status continuation thread -- )

extra/ui/tools/walker/walker.factor

@@ -4,7 +4,7 @@ USING: kernel concurrency.messaging inspector ui.tools.listener
 ui.tools.traceback ui.gadgets.buttons ui.gadgets.status-bar
 ui.gadgets.tracks ui.commands ui.gadgets models
 ui.tools.workspace ui.gestures ui.gadgets.labels ui threads
-namespaces tools.walker assocs combinators combinators.cleave ;
+namespaces tools.walker assocs combinators ;
 IN: ui.tools.walker
 
 TUPLE: walker-gadget

extra/unix/process/process.factor

@@ -1,5 +1,5 @@
 USING: kernel alien.c-types sequences math unix
-combinators.cleave vectors kernel namespaces continuations
+vectors kernel namespaces continuations
 threads assocs vectors io.unix.backend ;
 
 IN: unix.process

extra/windows/com/syntax/syntax.factor

@@ -1,8 +1,6 @@
-USING: alien alien.c-types kernel windows.ole32
+USING: alien alien.c-types kernel windows.ole32 combinators.lib
-combinators.lib parser splitting sequences.lib
+parser splitting sequences.lib sequences namespaces assocs
-sequences namespaces combinators.cleave
+quotations shuffle accessors words macros alien.syntax fry ;
-assocs quotations shuffle accessors words macros
-alien.syntax fry ;
 IN: windows.com.syntax
 
 <PRIVATE

extra/xmode/code2html/responder/responder.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.files io.encodings.utf8 namespaces http.server
 http.server.static http xmode.code2html kernel html sequences
-accessors fry combinators.cleave ;
+accessors fry ;
 IN: xmode.code2html.responder
 
 : <sources> ( root -- responder )