From 1f3e6fd0b72bc89667a7634faad4b573c34403d3 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 28 Mar 2008 23:00:20 -0500 Subject: [PATCH] combinators.cleave is now core --- core/kernel/kernel.factor | 77 +++++++++++++++---- extra/benchmark/benchmark.factor | 2 +- extra/boids/boids.factor | 1 - extra/boids/ui/ui.factor | 1 - extra/bunny/bunny.factor | 15 ++-- extra/bunny/model/model.factor | 10 +-- extra/bunny/outlined/outlined.factor | 7 +- extra/cairo/lib/lib.factor | 3 +- extra/cairo/png/png.factor | 5 +- extra/calendar/format/format.factor | 3 +- extra/calendar/windows/windows.factor | 3 +- extra/cfdg/cfdg.factor | 2 +- extra/colors/hsv/hsv.factor | 3 +- extra/combinators/lib/lib.factor | 3 +- .../distributed/distributed.factor | 5 +- extra/db/postgresql/lib/lib.factor | 8 +- extra/db/postgresql/postgresql.factor | 2 +- extra/db/sqlite/sqlite.factor | 2 +- extra/db/tuples/tuples.factor | 3 +- extra/http/http.factor | 3 +- extra/http/server/actions/actions.factor | 2 +- extra/http/server/auth/login/login.factor | 4 +- extra/http/server/callbacks/callbacks.factor | 3 +- .../http/server/components/components.factor | 2 +- extra/http/server/db/db.factor | 2 +- extra/http/server/server.factor | 2 +- extra/http/server/sessions/sessions.factor | 4 +- .../sessions/storage/assoc/assoc.factor | 5 +- .../http/server/sessions/storage/db/db.factor | 2 +- extra/http/server/static/static.factor | 3 +- .../http/server/validators/validators.factor | 3 +- extra/io/encodings/8-bit/8-bit.factor | 7 +- extra/io/unix/files/files.factor | 4 +- extra/io/windows/files/files.factor | 9 +-- extra/io/windows/nt/files/files.factor | 3 +- extra/locals/locals.factor | 2 +- extra/lsys/strings/interpret/interpret.factor | 2 +- extra/lsys/strings/rewrite/rewrite.factor | 2 +- extra/lsys/strings/strings.factor | 2 +- extra/math/analysis/analysis.factor | 2 +- extra/math/matrices/matrices.factor | 2 +- extra/opengl/demo-support/demo-support.factor | 2 +- extra/opengl/shaders/shaders.factor | 2 +- extra/project-euler/039/039.factor | 2 +- extra/project-euler/075/075.factor | 2 +- extra/random-weighted/random-weighted.factor | 2 +- .../blum-blum-shub/blum-blum-shub.factor | 2 +- .../mersenne-twister/mersenne-twister.factor | 3 +- extra/raptor/cron/cron.factor | 2 +- extra/raptor/cronjobs.factor | 2 +- extra/raptor/raptor.factor | 3 +- extra/reports/noise/noise.factor | 4 +- extra/reports/optimizer/optimizer.factor | 2 +- extra/serialize/serialize.factor | 4 +- extra/springies/springies.factor | 2 +- extra/springies/ui/ui.factor | 2 +- extra/tools/walker/walker.factor | 2 +- extra/ui/tools/walker/walker.factor | 2 +- extra/unix/process/process.factor | 2 +- extra/windows/com/syntax/syntax.factor | 8 +- .../code2html/responder/responder.factor | 2 +- 61 files changed, 151 insertions(+), 126 deletions(-) diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor index 2d99f0793b..1987597c58 100755 --- a/core/kernel/kernel.factor +++ b/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 -- ) - pick [ drop call ] [ 2nip call ] if ; inline - -: ?if ( default cond true false -- ) - pick [ roll 2drop call ] [ 2nip call ] if ; inline - +! Single branch : 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 diff --git a/extra/benchmark/benchmark.factor b/extra/benchmark/benchmark.factor index 26f1a9e96d..a75251331f 100755 --- a/extra/benchmark/benchmark.factor +++ b/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 ) diff --git a/extra/boids/boids.factor b/extra/boids/boids.factor index 611e00a9b4..efa7216699 100644 --- a/extra/boids/boids.factor +++ b/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 diff --git a/extra/boids/ui/ui.factor b/extra/boids/ui/ui.factor index b545f41060..a1feac381d 100755 --- a/extra/boids/ui/ui.factor +++ b/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 diff --git a/extra/bunny/bunny.factor b/extra/bunny/bunny.factor index 963379896d..43b9edcd00 100755 --- a/extra/bunny/bunny.factor +++ b/extra/bunny/bunny.factor @@ -1,11 +1,10 @@ -USING: alien alien.c-types arrays sequences math -math.vectors math.matrices math.parser io io.files kernel opengl -opengl.gl opengl.glu shuffle http.client vectors -namespaces ui.gadgets ui.gadgets.canvas ui.render ui splitting -combinators tools.time system combinators.lib combinators.cleave -float-arrays continuations opengl.demo-support multiline -ui.gestures -bunny.fixed-pipeline bunny.cel-shaded bunny.outlined bunny.model ; +USING: alien alien.c-types arrays sequences math math.vectors +math.matrices math.parser io io.files kernel opengl opengl.gl +opengl.glu shuffle http.client vectors namespaces ui.gadgets +ui.gadgets.canvas ui.render ui splitting combinators tools.time +system combinators.lib float-arrays continuations +opengl.demo-support multiline ui.gestures bunny.fixed-pipeline +bunny.cel-shaded bunny.outlined bunny.model ; IN: bunny TUPLE: bunny-gadget model geom draw-seq draw-n ; diff --git a/extra/bunny/model/model.factor b/extra/bunny/model/model.factor index 1d90209ed4..79a8a00856 100755 --- a/extra/bunny/model/model.factor +++ b/extra/bunny/model/model.factor @@ -1,8 +1,8 @@ -USING: alien alien.c-types arrays sequences math math.vectors math.matrices - math.parser io io.files kernel opengl opengl.gl opengl.glu io.encodings.ascii - opengl.capabilities shuffle http.client vectors splitting tools.time system - combinators combinators.cleave float-arrays continuations namespaces - sequences.lib ; +USING: alien alien.c-types arrays sequences math math.vectors +math.matrices math.parser io io.files kernel opengl opengl.gl +opengl.glu io.encodings.ascii opengl.capabilities shuffle +http.client vectors splitting tools.time system combinators +float-arrays continuations namespaces sequences.lib ; IN: bunny.model : numbers ( str -- seq ) diff --git a/extra/bunny/outlined/outlined.factor b/extra/bunny/outlined/outlined.factor index 6295e3b9de..7cdfba7c79 100755 --- a/extra/bunny/outlined/outlined.factor +++ b/extra/bunny/outlined/outlined.factor @@ -1,7 +1,6 @@ -USING: arrays bunny.model bunny.cel-shaded -combinators.cleave continuations kernel math multiline -opengl opengl.shaders opengl.framebuffers opengl.gl -opengl.capabilities sequences ui.gadgets combinators.cleave ; +USING: arrays bunny.model bunny.cel-shaded continuations kernel +math multiline opengl opengl.shaders opengl.framebuffers +opengl.gl opengl.capabilities sequences ui.gadgets ; IN: bunny.outlined STRING: outlined-pass1-fragment-shader-main-source diff --git a/extra/cairo/lib/lib.factor b/extra/cairo/lib/lib.factor index 1b969978a3..4f532cd9ec 100755 --- a/extra/cairo/lib/lib.factor +++ b/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 -accessors ; +kernel libc locals math shuffle accessors ; IN: cairo.lib TUPLE: cairo-t alien ; diff --git a/extra/cairo/png/png.factor b/extra/cairo/png/png.factor index 55828cde9c..eaab28e659 100755 --- a/extra/cairo/png/png.factor +++ b/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 -accessors math ui.gadgets ui.render opengl.gl byte-arrays -namespaces opengl cairo.ffi cairo.lib ; +USING: arrays kernel accessors math ui.gadgets ui.render +opengl.gl byte-arrays namespaces opengl cairo.ffi cairo.lib ; IN: cairo.png TUPLE: png surface width height cairo-t array ; diff --git a/extra/calendar/format/format.factor b/extra/calendar/format/format.factor index 0ac0ebb2c3..b0bd7c464f 100755 --- a/extra/calendar/format/format.factor +++ b/extra/calendar/format/format.factor @@ -1,6 +1,5 @@ USING: math math.parser kernel sequences io calendar -accessors arrays io.streams.string combinators accessors -combinators.cleave ; +accessors arrays io.streams.string combinators accessors ; IN: calendar.format GENERIC: day. ( obj -- ) diff --git a/extra/calendar/windows/windows.factor b/extra/calendar/windows/windows.factor index 6986902ff1..8548e4ee52 100755 --- a/extra/calendar/windows/windows.factor +++ b/extra/calendar/windows/windows.factor @@ -1,6 +1,5 @@ USING: calendar.backend namespaces alien.c-types -windows windows.kernel32 kernel math combinators.cleave -combinators ; +windows windows.kernel32 kernel math combinators ; IN: calendar.windows TUPLE: windows-calendar ; diff --git a/extra/cfdg/cfdg.factor b/extra/cfdg/cfdg.factor index c3ada95533..8a1d93aceb 100644 --- a/extra/cfdg/cfdg.factor +++ b/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 diff --git a/extra/colors/hsv/hsv.factor b/extra/colors/hsv/hsv.factor index 8d91d971e4..dd2811822b 100644 --- a/extra/colors/hsv/hsv.factor +++ b/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 - combinators.cleave ; +USING: kernel combinators arrays sequences math math.functions ; IN: colors.hsv diff --git a/extra/combinators/lib/lib.factor b/extra/combinators/lib/lib.factor index 9fe19555c5..deb03f72e2 100755 --- a/extra/combinators/lib/lib.factor +++ b/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 -continuations ; +arrays.lib shuffle macros bake continuations ; IN: combinators.lib diff --git a/extra/concurrency/distributed/distributed.factor b/extra/concurrency/distributed/distributed.factor index c007e9f152..6704272305 100755 --- a/extra/concurrency/distributed/distributed.factor +++ b/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 -threads io io.server qualified arrays -namespaces kernel io.encodings.binary combinators.cleave +USING: serialize sequences concurrency.messaging threads io +io.server qualified arrays namespaces kernel io.encodings.binary accessors ; QUALIFIED: io.sockets IN: concurrency.distributed diff --git a/extra/db/postgresql/lib/lib.factor b/extra/db/postgresql/lib/lib.factor index 270be886c5..bfe7dab3ce 100755 --- a/extra/db/postgresql/lib/lib.factor +++ b/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 -combinators combinators.cleave libc shuffle calendar.format -byte-arrays destructors prettyprint accessors -strings serialize io.encodings.binary io.streams.byte-array ; +db.types tools.walker ascii splitting math.parser combinators +libc shuffle calendar.format byte-arrays destructors prettyprint +accessors strings serialize io.encodings.binary +io.streams.byte-array ; IN: db.postgresql.lib : postgresql-result-error-message ( res -- str/f ) diff --git a/extra/db/postgresql/postgresql.factor b/extra/db/postgresql/postgresql.factor index 8a6f8632ec..f9805560ad 100755 --- a/extra/db/postgresql/postgresql.factor +++ b/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 ; diff --git a/extra/db/sqlite/sqlite.factor b/extra/db/sqlite/sqlite.factor index d7d954c0dc..c81448865f 100755 --- a/extra/db/sqlite/sqlite.factor +++ b/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 diff --git a/extra/db/tuples/tuples.factor b/extra/db/tuples/tuples.factor index 0f69b0fafb..00e8ed8b76 100755 --- a/extra/db/tuples/tuples.factor +++ b/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 -combinators.cleave ; +mirrors sequences.lib tools.walker combinators.lib ; IN: db.tuples : define-persistent ( class table columns -- ) diff --git a/extra/http/http.factor b/extra/http/http.factor index 0bb983c53d..69c0ba2c9f 100755 --- a/extra/http/http.factor +++ b/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 -combinators.lib byte-arrays ; +calendar.format quotations arrays combinators.lib byte-arrays ; IN: http : http-port 80 ; inline diff --git a/extra/http/server/actions/actions.factor b/extra/http/server/actions/actions.factor index f39980037d..fcafa57ff6 100755 --- a/extra/http/server/actions/actions.factor +++ b/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 diff --git a/extra/http/server/auth/login/login.factor b/extra/http/server/auth/login/login.factor index 8c61a9dd47..89984b0e84 100755 --- a/extra/http/server/auth/login/login.factor +++ b/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 -qualified continuations destructors ; +fry io.sockets arrays threads locals qualified continuations +destructors ; IN: http.server.auth.login QUALIFIED: smtp diff --git a/extra/http/server/callbacks/callbacks.factor b/extra/http/server/callbacks/callbacks.factor index ab629ae236..e1b737a9c6 100755 --- a/extra/http/server/callbacks/callbacks.factor +++ b/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 -combinators.cleave fry assocs.lib ; +accessors arrays alarms quotations combinators fry assocs.lib ; IN: http.server.callbacks SYMBOL: responder diff --git a/extra/http/server/components/components.factor b/extra/http/server/components/components.factor index 516abe79a5..828ff8e562 100755 --- a/extra/http/server/components/components.factor +++ b/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 diff --git a/extra/http/server/db/db.factor b/extra/http/server/db/db.factor index 0b2e9bccc3..a0d732c1ef 100755 --- a/extra/http/server/db/db.factor +++ b/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 ; diff --git a/extra/http/server/server.factor b/extra/http/server/server.factor index 81201dd3fe..2cc0f80f03 100755 --- a/extra/http/server/server.factor +++ b/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 ) diff --git a/extra/http/server/sessions/sessions.factor b/extra/http/server/sessions/sessions.factor index aea1bef930..a3d06e8f18 100755 --- a/extra/http/server/sessions/sessions.factor +++ b/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 -html.elements symbols continuations destructors ; +quotations hashtables sequences fry html.elements symbols +continuations destructors ; IN: http.server.sessions ! ! ! ! ! ! diff --git a/extra/http/server/sessions/storage/assoc/assoc.factor b/extra/http/server/sessions/storage/assoc/assoc.factor index f72f34e4d2..4bdc52b86e 100755 --- a/extra/http/server/sessions/storage/assoc/assoc.factor +++ b/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 -http.server.sessions.storage combinators.cleave alarms kernel -fry http.server ; +USING: assocs assocs.lib accessors http.server.sessions.storage +alarms kernel fry http.server ; IN: http.server.sessions.storage.assoc TUPLE: sessions-in-memory sessions alarms ; diff --git a/extra/http/server/sessions/storage/db/db.factor b/extra/http/server/sessions/storage/db/db.factor index 4d87aea5a3..471b7fa6df 100755 --- a/extra/http/server/sessions/storage/db/db.factor +++ b/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 diff --git a/extra/http/server/static/static.factor b/extra/http/server/static/static.factor index 2f48e7ac87..905c7320ca 100755 --- a/extra/http/server/static/static.factor +++ b/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 -combinators.cleave fry ; +calendar.format accessors io.encodings.binary fry ; IN: http.server.static ! special maps mime types to quots with effect ( path -- ) diff --git a/extra/http/server/validators/validators.factor b/extra/http/server/validators/validators.factor index b3710f6439..32a1125809 100755 --- a/extra/http/server/validators/validators.factor +++ b/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 -combinators.cleave sequences ; +math.parser assocs regexp fry unicode.categories sequences ; IN: http.server.validators SYMBOL: validation-failed? diff --git a/extra/io/encodings/8-bit/8-bit.factor b/extra/io/encodings/8-bit/8-bit.factor index d29760a3e0..d2348fd4b0 100755 --- a/extra/io/encodings/8-bit/8-bit.factor +++ b/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 -assocs hashtables io.encodings.ascii combinators.cleave -generic parser tuples words io io.files splitting namespaces -math compiler.units accessors ; +USING: math.parser arrays io.encodings sequences kernel assocs +hashtables io.encodings.ascii generic parser tuples words io +io.files splitting namespaces math compiler.units accessors ; IN: io.encodings.8-bit ( root -- responder )