From cf80dd122adf3e0ec3fa423823f16d13679399b5 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 10 Sep 2008 22:11:40 -0500 Subject: [PATCH] Updating code for make and fry changes --- basis/bootstrap/image/upload/upload.factor | 2 +- basis/channels/remote/remote.factor | 2 +- basis/checksums/common/common.factor | 2 +- basis/checksums/sha1/sha1.factor | 4 +-- basis/checksums/sha2/sha2.factor | 2 +- basis/cocoa/enumeration/enumeration.factor | 4 +-- .../short-circuit/short-circuit.factor | 4 +-- basis/compiler/compiler.factor | 2 +- .../tree/cleanup/cleanup-tests.factor | 2 +- basis/compiler/tree/cleanup/cleanup.factor | 8 ++--- .../tree/combinators/combinators.factor | 16 +++++----- .../tree/dead-code/branches/branches.factor | 6 ++-- .../tree/dead-code/simple/simple.factor | 2 +- basis/compiler/tree/debugger/debugger.factor | 2 +- .../recursive/recursive.factor | 4 +-- .../tree/finalization/finalization.factor | 2 +- .../tree/normalization/normalization.factor | 16 +++++----- .../tree/propagation/branches/branches.factor | 4 +-- .../known-words/known-words.factor | 14 ++++---- .../tree/propagation/simple/simple.factor | 4 +-- basis/compiler/tree/tree.factor | 2 +- .../cpu/ppc/assembler/backend/backend.factor | 2 +- basis/csv/csv.factor | 3 +- basis/db/postgresql/postgresql.factor | 2 +- basis/db/queries/queries.factor | 8 ++--- basis/db/tuples/tuples-docs.factor | 2 +- basis/db/tuples/tuples-tests.factor | 4 +-- basis/disjoint-sets/disjoint-sets.factor | 8 ++--- basis/fry/fry-docs.factor | 32 +++++++++---------- basis/fry/fry-tests.factor | 26 +++++++-------- basis/fry/fry.factor | 18 ++++------- basis/furnace/actions/actions.factor | 6 ++-- basis/furnace/alloy/alloy.factor | 4 +-- basis/furnace/auth/auth.factor | 2 +- basis/furnace/auth/basic/basic.factor | 2 +- .../recover-password/recover-password.factor | 6 ++-- basis/furnace/chloe-tags/chloe-tags.factor | 4 +-- .../conversations/conversations.factor | 4 +-- basis/furnace/furnace.factor | 2 +- basis/furnace/redirection/redirection.factor | 2 +- basis/furnace/syndication/syndication.factor | 2 +- basis/generalizations/generalizations.factor | 20 ++++++------ basis/help/lint/lint.factor | 4 +-- basis/hints/hints.factor | 4 +-- basis/html/components/components.factor | 2 +- basis/html/elements/elements.factor | 10 +++--- basis/html/forms/forms.factor | 4 +-- basis/html/streams/streams.factor | 11 +++---- basis/html/templates/chloe/chloe.factor | 7 ++-- .../templates/chloe/compiler/compiler.factor | 7 ++-- .../chloe/components/components.factor | 6 ++-- basis/html/templates/fhtml/fhtml.factor | 2 +- basis/http/client/client.factor | 6 ++-- basis/http/http.factor | 6 ++-- basis/http/parsers/parsers.factor | 6 ++-- basis/http/server/cgi/cgi.factor | 2 +- basis/http/server/server.factor | 6 ++-- basis/http/server/static/static.factor | 2 +- basis/io/servers/connection/connection.factor | 4 +-- basis/io/servers/packet/datagram.factor | 2 +- basis/json/reader/reader.factor | 2 +- basis/json/writer/writer.factor | 6 ++-- basis/lcs/lcs.factor | 3 +- basis/logging/insomniac/insomniac.factor | 2 +- basis/logging/logging.factor | 8 ++--- basis/logging/parser/parser.factor | 5 +-- basis/math/bitwise/bitwise.factor | 2 +- basis/mime-types/mime-types.factor | 2 +- basis/multiline/multiline.factor | 4 +-- basis/peg/ebnf/ebnf.factor | 12 +++---- basis/peg/peg.factor | 14 ++++---- .../hashtables/hashtables-tests.factor | 2 +- basis/persistent/hashtables/hashtables.factor | 2 +- .../nodes/collision/collision.factor | 2 +- .../hashtables/nodes/leaf/leaf.factor | 2 +- basis/smtp/smtp.factor | 2 +- basis/stack-checker/backend/backend.factor | 4 +-- basis/stack-checker/branches/branches.factor | 6 ++-- basis/stack-checker/inlining/inlining.factor | 4 +-- basis/stack-checker/state/state.factor | 4 +-- .../transforms/transforms.factor | 4 +-- basis/state-parser/state-parser.factor | 4 +-- basis/syndication/syndication.factor | 2 +- basis/tools/deploy/shaker/shaker.factor | 6 ++-- basis/tr/tr.factor | 6 ++-- basis/ui/gadgets/tracks/tracks.factor | 2 +- basis/unicode/breaks/breaks.factor | 9 +++--- basis/unicode/collation/collation.factor | 2 +- basis/unicode/script/script.factor | 2 +- basis/urls/urls.factor | 6 ++-- basis/validators/validators.factor | 7 ++-- basis/windows/com/syntax/syntax.factor | 2 +- basis/windows/com/wrapper/wrapper.factor | 18 +++++------ .../windows/dinput/constants/constants.factor | 2 +- basis/wrap/wrap.factor | 2 +- basis/x11/glx/glx.factor | 2 +- basis/xml/entities/entities.factor | 2 +- basis/xml/generator/generator.factor | 3 +- basis/xml/tokenize/tokenize.factor | 6 ++-- .../code2html/responder/responder.factor | 4 +-- basis/xmode/loader/syntax/syntax.factor | 9 ++++-- basis/xmode/marker/marker.factor | 4 ++- basis/xmode/marker/state/state.factor | 4 ++- extra/asn1/asn1.factor | 2 +- extra/backtrack/backtrack.factor | 10 +++--- extra/benchmark/dispatch2/dispatch2.factor | 2 +- extra/benchmark/dispatch3/dispatch3.factor | 2 +- extra/benchmark/mandel/mandel.factor | 10 +++--- .../benchmark/nsieve-bits/nsieve-bits.factor | 2 +- extra/benchmark/nsieve/nsieve.factor | 2 +- extra/benchmark/raytracer/raytracer.factor | 2 +- extra/bitfields/bitfields.factor | 6 ++-- extra/builder/release/upload/upload.factor | 2 +- extra/cfdg/cfdg.factor | 2 +- extra/combinators/cleave/cleave.factor | 8 ++--- .../conditional/conditional.factor | 2 +- extra/combinators/lib/lib.factor | 6 ++-- extra/coroutines/coroutines.factor | 2 +- extra/ctags/ctags.factor | 2 +- extra/ctags/etags/etags.factor | 4 +-- extra/demos/demos.factor | 2 +- extra/display-stack/display-stack.factor | 2 +- extra/dns/server/server.factor | 2 +- extra/dns/util/util.factor | 2 +- extra/faq/faq.factor | 2 +- extra/fjsc/fjsc.factor | 4 +-- extra/ftp/client/client.factor | 2 +- extra/ftp/server/server.factor | 14 ++++---- extra/graph-theory/graph-theory.factor | 16 +++++----- extra/graph-theory/sparse/sparse.factor | 2 +- extra/html/parser/analyzer/analyzer.factor | 5 +-- extra/html/parser/parser.factor | 4 +-- extra/inverse/inverse.factor | 2 +- extra/irc/client/client.factor | 8 ++--- extra/irc/messages/messages.factor | 4 +-- extra/irc/ui/ui.factor | 10 +++--- extra/joystick-demo/joystick-demo.factor | 2 +- extra/key-caps/key-caps.factor | 2 +- extra/lisp/lisp.factor | 14 ++++---- extra/lists/lazy/lazy.factor | 2 +- extra/math/blas/vectors/vectors.factor | 6 ++-- extra/math/combinatorics/combinatorics.factor | 2 +- .../numerical-integration.factor | 2 +- extra/math/polynomials/polynomials.factor | 4 +-- extra/math/primes/factors/factors.factor | 3 +- extra/monads/monads.factor | 32 +++++++++---------- extra/money/money.factor | 2 +- extra/morse/morse.factor | 4 ++- extra/multi-methods/multi-methods.factor | 8 ++--- extra/odbc/odbc.factor | 4 +-- extra/opengl/capabilities/capabilities.factor | 2 +- extra/ori/ori.factor | 2 +- extra/pack/pack.factor | 4 +-- extra/processing/processing.factor | 2 +- extra/project-euler/009/009.factor | 2 +- extra/project-euler/011/011.factor | 2 +- extra/project-euler/014/014.factor | 4 +-- extra/project-euler/042/042.factor | 2 +- extra/project-euler/059/059.factor | 2 +- extra/project-euler/079/079.factor | 4 +-- extra/project-euler/ave-time/ave-time.factor | 2 +- extra/project-euler/common/common.factor | 7 ++-- extra/promises/promises.factor | 2 +- extra/random-weighted/random-weighted.factor | 2 +- extra/regexp/regexp.factor | 3 +- .../rewrite-closures/rewrite-closures.factor | 3 +- extra/roman/roman.factor | 5 +-- extra/sequences/lib/lib.factor | 9 +++--- extra/state-machine/state-machine.factor | 2 +- extra/state-tables/state-tables.factor | 2 +- extra/synth/example/example.factor | 3 +- extra/ui/gadgets/tabs/tabs.factor | 4 +-- extra/ui/gadgets/tiling/tiling.factor | 4 +-- extra/webapps/counter/counter.factor | 2 +- extra/webapps/planet/planet.factor | 4 +-- extra/webapps/wee-url/wee-url.factor | 2 +- extra/webapps/wiki/wiki.factor | 2 +- extra/wordtimer/wordtimer.factor | 4 ++- extra/xml/syntax/syntax.factor | 2 +- 179 files changed, 445 insertions(+), 429 deletions(-) diff --git a/basis/bootstrap/image/upload/upload.factor b/basis/bootstrap/image/upload/upload.factor index de13b4aed4..f0edf85e65 100755 --- a/basis/bootstrap/image/upload/upload.factor +++ b/basis/bootstrap/image/upload/upload.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: checksums checksums.openssl splitting assocs -kernel io.files bootstrap.image sequences io namespaces +kernel io.files bootstrap.image sequences io namespaces make io.launcher math io.encodings.ascii ; IN: bootstrap.image.upload diff --git a/basis/channels/remote/remote.factor b/basis/channels/remote/remote.factor index 9c1878e14d..1a7addac12 100755 --- a/basis/channels/remote/remote.factor +++ b/basis/channels/remote/remote.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. ! ! Remote Channels -USING: kernel init namespaces assocs arrays random +USING: kernel init namespaces make assocs arrays random sequences channels match concurrency.messaging concurrency.distributed threads accessors ; IN: channels.remote diff --git a/basis/checksums/common/common.factor b/basis/checksums/common/common.factor index ea1c6f5b39..1f25efef24 100644 --- a/basis/checksums/common/common.factor +++ b/basis/checksums/common/common.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2006, 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: kernel math math.bitwise strings io.binary namespaces -grouping ; +make grouping ; IN: checksums.common SYMBOL: bytes-read diff --git a/basis/checksums/sha1/sha1.factor b/basis/checksums/sha1/sha1.factor index 6aa2cfa2eb..bbae421b16 100755 --- a/basis/checksums/sha1/sha1.factor +++ b/basis/checksums/sha1/sha1.factor @@ -2,8 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license. USING: arrays combinators kernel io io.encodings.binary io.files io.streams.byte-array math.vectors strings sequences namespaces -math parser sequences assocs grouping vectors io.binary hashtables -symbols math.bitwise checksums checksums.common ; +make math parser sequences assocs grouping vectors io.binary +hashtables symbols math.bitwise checksums checksums.common ; IN: checksums.sha1 ! Implemented according to RFC 3174. diff --git a/basis/checksums/sha2/sha2.factor b/basis/checksums/sha2/sha2.factor index ac93c05260..0a6d8c26ab 100755 --- a/basis/checksums/sha2/sha2.factor +++ b/basis/checksums/sha2/sha2.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel splitting grouping math sequences namespaces +USING: kernel splitting grouping math sequences namespaces make io.binary symbols math.bitwise checksums checksums.common sbufs strings ; IN: checksums.sha2 diff --git a/basis/cocoa/enumeration/enumeration.factor b/basis/cocoa/enumeration/enumeration.factor index 765fb65ef2..7de1f24a3c 100644 --- a/basis/cocoa/enumeration/enumeration.factor +++ b/basis/cocoa/enumeration/enumeration.factor @@ -15,7 +15,7 @@ IN: cocoa.enumeration object state stackbuf count -> countByEnumeratingWithState:objects:count: dup zero? [ drop ] [ state NSFastEnumerationState-itemsPtr [ stackbuf ] unless* - '[ , void*-nth quot call ] each + '[ _ void*-nth quot call ] each object quot state stackbuf count (NSFastEnumeration-each) ] if ; inline recursive @@ -24,7 +24,7 @@ IN: cocoa.enumeration : NSFastEnumeration-map ( object quot -- vector ) NS-EACH-BUFFER-SIZE - [ '[ @ , push ] NSFastEnumeration-each ] keep ; inline + [ '[ @ _ push ] NSFastEnumeration-each ] keep ; inline : NSFastEnumeration>vector ( object -- vector ) [ ] NSFastEnumeration-map ; diff --git a/basis/combinators/short-circuit/short-circuit.factor b/basis/combinators/short-circuit/short-circuit.factor index a484e09de1..7b6c1d126d 100755 --- a/basis/combinators/short-circuit/short-circuit.factor +++ b/basis/combinators/short-circuit/short-circuit.factor @@ -11,7 +11,7 @@ IN: combinators.short-circuit [ '[ drop N ndup @ dup not ] [ drop N ndrop f ] 2array ] map [ t ] [ N nnip ] 2array suffix - '[ f , cond ] ; + '[ f _ cond ] ; MACRO: 0&& ( quots -- quot ) 0 n&&-rewrite ; MACRO: 1&& ( quots -- quot ) 1 n&&-rewrite ; @@ -25,7 +25,7 @@ MACRO: 3&& ( quots -- quot ) 3 n&&-rewrite ; [ '[ drop N ndup @ dup ] [ N nnip ] 2array ] map [ drop N ndrop t ] [ f ] 2array suffix - '[ f , cond ] ; + '[ f _ cond ] ; MACRO: 0|| ( quots -- quot ) 0 n||-rewrite ; MACRO: 1|| ( quots -- quot ) 1 n||-rewrite ; diff --git a/basis/compiler/compiler.factor b/basis/compiler/compiler.factor index 2dd6e440d5..1558127293 100755 --- a/basis/compiler/compiler.factor +++ b/basis/compiler/compiler.factor @@ -54,7 +54,7 @@ SYMBOL: +failed+ H{ } clone dependencies set H{ } clone generic-dependencies set - , { + _ { [ compile-begins ] [ [ build-tree-from-word ] [ compile-failed return ] recover diff --git a/basis/compiler/tree/cleanup/cleanup-tests.factor b/basis/compiler/tree/cleanup/cleanup-tests.factor index 644b834117..a761c8ec1e 100644 --- a/basis/compiler/tree/cleanup/cleanup-tests.factor +++ b/basis/compiler/tree/cleanup/cleanup-tests.factor @@ -36,7 +36,7 @@ compiler.tree.checker ; : inlined? ( quot seq/word -- ? ) [ cleaned-up-tree ] dip dup word? [ 1array ] when - '[ dup #call? [ word>> , member? ] [ drop f ] if ] + '[ dup #call? [ word>> _ member? ] [ drop f ] if ] contains-node? not ; [ f ] [ diff --git a/basis/compiler/tree/cleanup/cleanup.factor b/basis/compiler/tree/cleanup/cleanup.factor index 44a6a11802..58dc07d868 100644 --- a/basis/compiler/tree/cleanup/cleanup.factor +++ b/basis/compiler/tree/cleanup/cleanup.factor @@ -101,7 +101,7 @@ M: #declare cleanup* drop f ; : delete-unreachable-branches ( #branch -- ) dup live-branches>> '[ - , + _ [ [ [ drop ] [ delete-nodes ] if ] 2each ] [ select-children ] 2bi @@ -148,9 +148,9 @@ M: #branch cleanup* M: #phi cleanup* #! Remove #phi function inputs which no longer exist. live-branches get - [ '[ , sift-children ] change-phi-in-d ] - [ '[ , sift-children ] change-phi-info-d ] - [ '[ , sift-children ] change-terminated ] tri + [ '[ _ sift-children ] change-phi-in-d ] + [ '[ _ sift-children ] change-phi-info-d ] + [ '[ _ sift-children ] change-terminated ] tri eliminate-phi live-branches off ; diff --git a/basis/compiler/tree/combinators/combinators.factor b/basis/compiler/tree/combinators/combinators.factor index 0f4dc3f2a3..f284a06a88 100644 --- a/basis/compiler/tree/combinators/combinators.factor +++ b/basis/compiler/tree/combinators/combinators.factor @@ -6,12 +6,12 @@ IN: compiler.tree.combinators : each-node ( nodes quot: ( node -- ) -- ) dup dup '[ - , [ + _ [ dup #branch? [ - children>> [ , each-node ] each + children>> [ _ each-node ] each ] [ dup #recursive? [ - child>> , each-node + child>> _ each-node ] [ drop ] if ] if ] bi @@ -21,22 +21,22 @@ IN: compiler.tree.combinators dup dup '[ @ dup #branch? [ - [ [ , map-nodes ] map ] change-children + [ [ _ map-nodes ] map ] change-children ] [ dup #recursive? [ - [ , map-nodes ] change-child + [ _ map-nodes ] change-child ] when ] if ] map flatten ; inline recursive : contains-node? ( nodes quot: ( node -- ? ) -- ? ) dup dup '[ - , keep swap [ drop t ] [ + _ keep swap [ drop t ] [ dup #branch? [ - children>> [ , contains-node? ] contains? + children>> [ _ contains-node? ] contains? ] [ dup #recursive? [ - child>> , contains-node? + child>> _ contains-node? ] [ drop f ] if ] if ] if diff --git a/basis/compiler/tree/dead-code/branches/branches.factor b/basis/compiler/tree/dead-code/branches/branches.factor index 0014a1d4d7..a19e49494e 100644 --- a/basis/compiler/tree/dead-code/branches/branches.factor +++ b/basis/compiler/tree/dead-code/branches/branches.factor @@ -33,7 +33,7 @@ M: #branch remove-dead-code* : live-value-indices ( values -- indices ) [ length ] keep live-values get - '[ , nth , key? ] filter ; inline + '[ _ nth _ key? ] filter ; inline : drop-indexed-values ( values indices -- node ) [ drop filter-live ] [ nths ] 2bi @@ -44,13 +44,13 @@ M: #branch remove-dead-code* : insert-drops ( nodes values indices -- nodes' ) '[ over ends-with-terminate? - [ drop ] [ , drop-indexed-values suffix ] if + [ drop ] [ _ drop-indexed-values suffix ] if ] 2map ; : hoist-drops ( #phi -- ) if-node get swap [ phi-in-d>> ] [ out-d>> live-value-indices ] bi - '[ , , insert-drops ] change-children drop ; + '[ _ _ insert-drops ] change-children drop ; : remove-phi-outputs ( #phi -- ) [ filter-live ] change-out-d drop ; diff --git a/basis/compiler/tree/dead-code/simple/simple.factor b/basis/compiler/tree/dead-code/simple/simple.factor index 9ebf064f79..addb13ced3 100755 --- a/basis/compiler/tree/dead-code/simple/simple.factor +++ b/basis/compiler/tree/dead-code/simple/simple.factor @@ -53,7 +53,7 @@ M: #alien-invoke compute-live-values* nip look-at-inputs ; M: #alien-indirect compute-live-values* nip look-at-inputs ; : filter-mapping ( assoc -- assoc' ) - live-values get '[ drop , key? ] assoc-filter ; + live-values get '[ drop _ key? ] assoc-filter ; : filter-corresponding ( new old -- old' ) #! Remove elements from 'old' if the element with the same diff --git a/basis/compiler/tree/debugger/debugger.factor b/basis/compiler/tree/debugger/debugger.factor index 01b91b1613..691c564661 100644 --- a/basis/compiler/tree/debugger/debugger.factor +++ b/basis/compiler/tree/debugger/debugger.factor @@ -16,7 +16,7 @@ IN: compiler.tree.debugger GENERIC: node>quot ( node -- ) MACRO: match-choose ( alist -- ) - [ '[ , ] ] assoc-map '[ , match-cond ] ; + [ [ ] curry ] assoc-map [ match-cond ] curry ; MATCH-VARS: ?a ?b ?c ; diff --git a/basis/compiler/tree/escape-analysis/recursive/recursive.factor b/basis/compiler/tree/escape-analysis/recursive/recursive.factor index 059ac1de02..5aece23d17 100644 --- a/basis/compiler/tree/escape-analysis/recursive/recursive.factor +++ b/basis/compiler/tree/escape-analysis/recursive/recursive.factor @@ -28,7 +28,7 @@ IN: compiler.tree.escape-analysis.recursive : recursive-stacks ( #enter-recursive -- stacks ) recursive-phi-in - escaping-values get '[ [ , disjoint-set-member? ] all? ] filter + escaping-values get '[ [ _ disjoint-set-member? ] all? ] filter flip ; : analyze-recursive-phi ( #enter-recursive -- ) @@ -67,5 +67,5 @@ M: #return-recursive escape-analysis* ( #return-recursive -- ) [ call-next-method ] [ [ in-d>> ] [ label>> calls>> ] bi - [ out-d>> escaping-values get '[ , equate ] 2each ] with each + [ out-d>> escaping-values get '[ _ equate ] 2each ] with each ] bi ; diff --git a/basis/compiler/tree/finalization/finalization.factor b/basis/compiler/tree/finalization/finalization.factor index 540119f709..dafe032ab6 100644 --- a/basis/compiler/tree/finalization/finalization.factor +++ b/basis/compiler/tree/finalization/finalization.factor @@ -68,7 +68,7 @@ MEMO: builtin-predicate-expansion ( word -- nodes ) MEMO: (tuple-boa-expansion) ( n -- quot ) [ [ 2 + ] map - [ '[ [ , set-slot ] keep ] % ] each + [ '[ [ _ set-slot ] keep ] % ] each ] [ ] make ; : tuple-boa-expansion ( layout -- quot ) diff --git a/basis/compiler/tree/normalization/normalization.factor b/basis/compiler/tree/normalization/normalization.factor index 587dd6938b..b826a1590b 100644 --- a/basis/compiler/tree/normalization/normalization.factor +++ b/basis/compiler/tree/normalization/normalization.factor @@ -81,7 +81,7 @@ SYMBOL: rename-map [ rename-map get at ] keep or ; : rename-values ( values -- values' ) - rename-map get '[ [ , at ] keep or ] map ; + rename-map get '[ [ _ at ] keep or ] map ; GENERIC: rename-node-values* ( node -- node ) @@ -127,7 +127,7 @@ SYMBOL: introduction-stack : add-renamings ( old new -- ) [ rename-values ] dip - rename-map get '[ , set-at ] 2each ; + rename-map get '[ _ set-at ] 2each ; M: #introduce normalize* out-d>> [ length pop-introductions ] keep add-renamings f ; @@ -158,7 +158,7 @@ M: #branch normalize* M: #phi normalize* remaining-introductions get swap dup terminated>> - '[ , eliminate-phi-introductions ] change-phi-in-d ; + '[ _ eliminate-phi-introductions ] change-phi-in-d ; : (normalize) ( nodes introductions -- nodes ) introduction-stack [ @@ -168,7 +168,7 @@ M: #phi normalize* M: #recursive normalize* dup label>> introductions>> [ drop [ child>> first ] [ in-d>> ] bi >>in-d drop ] - [ make-values '[ , (normalize) ] change-child ] + [ make-values '[ _ (normalize) ] change-child ] 2bi ; M: #enter-recursive normalize* @@ -181,14 +181,14 @@ M: #enter-recursive normalize* : callreturn ( #call-recursive n -- #call-recursive ) - [ [ [ in-d>> ] [ out-d>> ] bi ] [ '[ , head ] ] bi* bi@ add-renamings ] - [ '[ , tail ] [ change-in-d ] [ change-out-d ] bi ] + [ [ [ in-d>> ] [ out-d>> ] bi ] [ '[ _ head ] ] bi* bi@ add-renamings ] + [ '[ _ tail ] [ change-in-d ] [ change-out-d ] bi ] 2bi ; M: #call-recursive normalize* diff --git a/basis/compiler/tree/propagation/branches/branches.factor b/basis/compiler/tree/propagation/branches/branches.factor index f06f6792c7..c76217f8ae 100644 --- a/basis/compiler/tree/propagation/branches/branches.factor +++ b/basis/compiler/tree/propagation/branches/branches.factor @@ -32,7 +32,7 @@ M: #if live-branches M: #dispatch live-branches [ children>> length ] [ in-d>> first value-info interval>> ] bi - '[ , interval-contains? ] map ; + '[ _ interval-contains? ] map ; : live-children ( #branch -- children ) [ children>> ] [ live-branches>> ] bi select-children ; @@ -61,7 +61,7 @@ SYMBOL: infer-children-data infer-children-data get [ '[ - , [ + _ [ dup +bottom+ eq? [ drop null-info ] [ value-info ] if ] bind diff --git a/basis/compiler/tree/propagation/known-words/known-words.factor b/basis/compiler/tree/propagation/known-words/known-words.factor index d31de354d1..d208d31389 100644 --- a/basis/compiler/tree/propagation/known-words/known-words.factor +++ b/basis/compiler/tree/propagation/known-words/known-words.factor @@ -118,7 +118,7 @@ most-negative-fixnum most-positive-fixnum [a,b] : binary-op ( word interval-quot post-proc-quot -- ) '[ - [ binary-op-class ] [ , binary-op-interval ] 2bi + [ binary-op-class ] [ _ binary-op-interval ] 2bi @ ] "outputs" set-word-prop ; @@ -159,14 +159,14 @@ most-negative-fixnum most-positive-fixnum [a,b] in1 in2 op negate-comparison (comparison-constraints) out f--> /\ ; : define-comparison-constraints ( word op -- ) - '[ , comparison-constraints ] "constraints" set-word-prop ; + '[ _ comparison-constraints ] "constraints" set-word-prop ; comparison-ops -[ dup '[ , define-comparison-constraints ] each-derived-op ] each +[ dup '[ _ define-comparison-constraints ] each-derived-op ] each generic-comparison-ops [ dup specific-comparison - '[ , , define-comparison-constraints ] each-derived-op + '[ _ _ define-comparison-constraints ] each-derived-op ] each ! Remove redundant comparisons @@ -179,13 +179,13 @@ generic-comparison-ops [ comparison-ops [ dup '[ - [ , fold-comparison ] "outputs" set-word-prop + [ _ fold-comparison ] "outputs" set-word-prop ] each-derived-op ] each generic-comparison-ops [ dup specific-comparison - '[ , fold-comparison ] "outputs" set-word-prop + '[ _ fold-comparison ] "outputs" set-word-prop ] each : maybe-or-never ( ? -- info ) @@ -221,7 +221,7 @@ generic-comparison-ops [ { >float float } } [ '[ - , + _ [ nip ] [ [ interval>> ] [ class-interval ] bi* interval-intersect diff --git a/basis/compiler/tree/propagation/simple/simple.factor b/basis/compiler/tree/propagation/simple/simple.factor index 809a85a51f..7fc38239f1 100644 --- a/basis/compiler/tree/propagation/simple/simple.factor +++ b/basis/compiler/tree/propagation/simple/simple.factor @@ -68,8 +68,8 @@ M: #declare propagate-before [ in-d>> [ value-info literal?>> ] all? ] [ drop f ] if ; : (fold-call) ( #call word -- info ) - [ [ out-d>> ] [ in-d>> [ value-info literal>> ] map ] bi ] [ '[ , execute ] ] bi* - '[ , , with-datastack [ ] map nip ] + [ [ out-d>> ] [ in-d>> [ value-info literal>> ] map ] bi ] [ '[ _ execute ] ] bi* + '[ _ _ with-datastack [ ] map nip ] [ drop [ object-info ] replicate ] recover ; diff --git a/basis/compiler/tree/tree.factor b/basis/compiler/tree/tree.factor index b6c798ca3c..05f33902ec 100755 --- a/basis/compiler/tree/tree.factor +++ b/basis/compiler/tree/tree.factor @@ -178,7 +178,7 @@ M: #return-recursive inputs/outputs [ in-d>> ] [ out-d>> ] bi ; : shuffle-effect ( #shuffle -- effect ) [ in-d>> ] [ out-d>> ] [ mapping>> ] tri - '[ , at ] map + '[ _ at ] map ; : recursive-phi-in ( #enter-recursive -- seq ) diff --git a/basis/cpu/ppc/assembler/backend/backend.factor b/basis/cpu/ppc/assembler/backend/backend.factor index b881f5a974..1b442662d5 100644 --- a/basis/cpu/ppc/assembler/backend/backend.factor +++ b/basis/cpu/ppc/assembler/backend/backend.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: compiler.generator.fixup kernel namespaces sequences +USING: compiler.generator.fixup kernel namespaces make sequences words math math.bitwise io.binary parser lexer ; IN: cpu.ppc.assembler.backend diff --git a/basis/csv/csv.factor b/basis/csv/csv.factor index 59a3f21863..133223b6e4 100644 --- a/basis/csv/csv.factor +++ b/basis/csv/csv.factor @@ -4,7 +4,8 @@ ! Simple CSV Parser ! Phil Dawes phil@phildawes.net -USING: kernel sequences io namespaces combinators unicode.categories ; +USING: kernel sequences io namespaces make +combinators unicode.categories ; IN: csv SYMBOL: delimiter diff --git a/basis/db/postgresql/postgresql.factor b/basis/db/postgresql/postgresql.factor index ae31b168cb..38fa4cc715 100755 --- a/basis/db/postgresql/postgresql.factor +++ b/basis/db/postgresql/postgresql.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2007, 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: arrays assocs alien alien.syntax continuations io -kernel math math.parser namespaces prettyprint quotations +kernel math math.parser namespaces make prettyprint quotations sequences debugger db db.postgresql.lib db.postgresql.ffi db.tuples db.types tools.annotations math.ranges combinators classes locals words tools.walker diff --git a/basis/db/queries/queries.factor b/basis/db/queries/queries.factor index ede7612942..89c28b5262 100644 --- a/basis/db/queries/queries.factor +++ b/basis/db/queries/queries.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors kernel math namespaces sequences random strings -math.parser math.intervals combinators math.bitwise nmake db -db.tuples db.types db.sql classes words shuffle arrays destructors -continuations ; +USING: accessors kernel math namespaces make sequences random +strings math.parser math.intervals combinators math.bitwise +nmake db db.tuples db.types db.sql classes words shuffle arrays +destructors continuations ; IN: db.queries GENERIC: where ( specs obj -- ) diff --git a/basis/db/tuples/tuples-docs.factor b/basis/db/tuples/tuples-docs.factor index ed605da25f..26ecec0365 100644 --- a/basis/db/tuples/tuples-docs.factor +++ b/basis/db/tuples/tuples-docs.factor @@ -154,7 +154,7 @@ T{ book "Now we've created a book. Let's save it to the database." { $code <" USING: db db.sqlite fry io.files ; : with-book-tutorial ( quot -- ) - '[ "book-tutorial.db" temp-file sqlite-db , with-db ] call ; + '[ "book-tutorial.db" temp-file sqlite-db _ with-db ] call ; [ book recreate-table diff --git a/basis/db/tuples/tuples-tests.factor b/basis/db/tuples/tuples-tests.factor index 3b04454995..67e46f9e18 100755 --- a/basis/db/tuples/tuples-tests.factor +++ b/basis/db/tuples/tuples-tests.factor @@ -201,10 +201,10 @@ TUPLE: annotation n paste-id summary author mode contents ; ! ] with-db : test-sqlite ( quot -- ) - [ ] swap '[ "tuples-test.db" temp-file sqlite-db , with-db ] unit-test ; + [ ] swap '[ "tuples-test.db" temp-file sqlite-db _ with-db ] unit-test ; : test-postgresql ( quot -- ) - [ ] swap '[ { "localhost" "postgres" "foob" "factor-test" } postgresql-db , with-db ] unit-test ; + [ ] swap '[ { "localhost" "postgres" "foob" "factor-test" } postgresql-db _ with-db ] unit-test ; : test-repeated-insert [ ] [ person ensure-table ] unit-test diff --git a/basis/disjoint-sets/disjoint-sets.factor b/basis/disjoint-sets/disjoint-sets.factor index 4ef787d33b..ea246cfa28 100644 --- a/basis/disjoint-sets/disjoint-sets.factor +++ b/basis/disjoint-sets/disjoint-sets.factor @@ -64,7 +64,7 @@ M: disjoint-set add-atom [ 1 -rot counts>> set-at ] 2tri ; -: add-atoms ( seq disjoint-set -- ) '[ , add-atom ] each ; +: add-atoms ( seq disjoint-set -- ) '[ _ add-atom ] each ; GENERIC: disjoint-set-member? ( a disjoint-set -- ? ) @@ -89,7 +89,7 @@ M:: disjoint-set equate ( a b disjoint-set -- ) ] if ; : equate-all-with ( seq a disjoint-set -- ) - '[ , , equate ] each ; + '[ _ _ equate ] each ; : equate-all ( seq disjoint-set -- ) over empty? [ 2drop ] [ @@ -102,7 +102,7 @@ M: disjoint-set clone : assoc>disjoint-set ( assoc -- disjoint-set ) - [ '[ drop , add-atom ] assoc-each ] - [ '[ , equate ] assoc-each ] + [ '[ drop _ add-atom ] assoc-each ] + [ '[ _ equate ] assoc-each ] [ nip ] 2tri ; diff --git a/basis/fry/fry-docs.factor b/basis/fry/fry-docs.factor index 4f33a6892a..286dbb469e 100755 --- a/basis/fry/fry-docs.factor +++ b/basis/fry/fry-docs.factor @@ -1,7 +1,7 @@ USING: help.markup help.syntax quotations kernel ; IN: fry -HELP: , +HELP: _ { $description "Fry specifier. Inserts a literal value into the fried quotation." } ; HELP: @ @@ -16,7 +16,7 @@ HELP: fry HELP: '[ { $syntax "code... ]" } -{ $description "Literal fried quotation. Expands into code which takes values from the stack and substitutes them in place of the fry specifiers " { $link , } " and " { $link @ } "." } +{ $description "Literal fried quotation. Expands into code which takes values from the stack and substitutes them in place of the fry specifiers " { $link _ } " and " { $link @ } "." } { $examples "See " { $link "fry.examples" } "." } ; ARTICLE: "fry.examples" "Examples of fried quotations" @@ -24,49 +24,49 @@ ARTICLE: "fry.examples" "Examples of fried quotations" $nl "If a quotation does not contain any fry specifiers, then " { $link POSTPONE: '[ } " behaves just like " { $link POSTPONE: [ } ":" { $code "{ 10 20 30 } '[ . ] each" } -"Occurrences of " { $link , } " on the left map directly to " { $link curry } ". That is, the following three lines are equivalent:" +"Occurrences of " { $link _ } " on the left map directly to " { $link curry } ". That is, the following three lines are equivalent:" { $code - "{ 10 20 30 } 5 '[ , + ] map" + "{ 10 20 30 } 5 '[ _ + ] map" "{ 10 20 30 } 5 [ + ] curry map" "{ 10 20 30 } [ 5 + ] map" } -"Occurrences of " { $link , } " in the middle of a quotation map to more complex quotation composition patterns. The following three lines are equivalent:" +"Occurrences of " { $link _ } " in the middle of a quotation map to more complex quotation composition patterns. The following three lines are equivalent:" { $code - "{ 10 20 30 } 5 '[ 3 , / ] map" + "{ 10 20 30 } 5 '[ 3 _ / ] map" "{ 10 20 30 } 5 [ 3 ] swap [ / ] curry compose map" "{ 10 20 30 } [ 3 5 / ] map" } -"Occurrences of " { $link @ } " are simply syntax sugar for " { $snippet ", call" } ". The following four lines are equivalent:" +"Occurrences of " { $link @ } " are simply syntax sugar for " { $snippet "_ call" } ". The following four lines are equivalent:" { $code "{ 10 20 30 } [ sq ] '[ @ . ] each" "{ 10 20 30 } [ sq ] [ call . ] curry each" "{ 10 20 30 } [ sq ] [ . ] compose each" "{ 10 20 30 } [ sq . ] each" } -"The " { $link , } " and " { $link @ } " specifiers may be freely mixed:" +"The " { $link _ } " and " { $link @ } " specifiers may be freely mixed:" { $code - "{ 8 13 14 27 } [ even? ] 5 '[ @ dup , ? ] map" + "{ 8 13 14 27 } [ even? ] 5 '[ @ dup _ ? ] map" "{ 8 13 14 27 } [ even? ] 5 [ dup ] swap [ ? ] curry 3compose map" "{ 8 13 14 27 } [ even? dup 5 ? ] map" } "Here are some built-in combinators rewritten in terms of fried quotations:" { $table - { { $link literalize } { $snippet ": literalize '[ , ] ;" } } - { { $link slip } { $snippet ": slip '[ @ , ] call ;" } } - { { $link curry } { $snippet ": curry '[ , @ ] ;" } } + { { $link literalize } { $snippet ": literalize '[ _ ] ;" } } + { { $link slip } { $snippet ": slip '[ @ _ ] call ;" } } + { { $link curry } { $snippet ": curry '[ _ @ ] ;" } } { { $link compose } { $snippet ": compose '[ @ @ ] ;" } } - { { $link bi@ } { $snippet ": bi@ tuck '[ , @ , @ ] call ;" } } + { { $link bi@ } { $snippet ": bi@ tuck '[ _ @ _ @ ] call ;" } } } ; ARTICLE: "fry.philosophy" "Fried quotation philosophy" "Fried quotations generalize quotation-building words such as " { $link curry } " and " { $link compose } ". They can clean up code with lots of currying and composition, particularly when quotations are nested:" { $code - "'[ [ , key? ] all? ] filter" + "'[ [ _ key? ] all? ] filter" "[ [ key? ] curry all? ] curry filter" } "There is a mapping from fried quotations to lexical closures as defined in the " { $vocab-link "locals" } " vocabulary. Namely, a fried quotation is equivalent to a ``let'' form where each local binding is only used once, and bindings are used in the same order in which they are defined. The following two lines are equivalent:" { $code - "'[ 3 , + 4 , / ]" + "'[ 3 _ + 4 _ / ]" "[let | a [ ] b [ ] | [ 3 a + 4 b / ] ]" } ; @@ -79,7 +79,7 @@ $nl "Fried quotations are denoted with a special parsing word:" { $subsection POSTPONE: '[ } "Fried quotations contain zero or more " { $emphasis "fry specifiers" } ":" -{ $subsection , } +{ $subsection _ } { $subsection @ } "When a fried quotation is being evaluated, values are consumed from the stack and spliced into the quotation from right to left." { $subsection "fry.examples" } diff --git a/basis/fry/fry-tests.factor b/basis/fry/fry-tests.factor index b8cdbc8cd7..5c5908416d 100755 --- a/basis/fry/fry-tests.factor +++ b/basis/fry/fry-tests.factor @@ -2,28 +2,28 @@ IN: fry.tests USING: fry tools.test math prettyprint kernel io arrays sequences ; -[ [ 3 + ] ] [ 3 '[ , + ] ] unit-test +[ [ 3 + ] ] [ 3 '[ _ + ] ] unit-test -[ [ 1 3 + ] ] [ 1 3 '[ , , + ] ] unit-test +[ [ 1 3 + ] ] [ 1 3 '[ _ _ + ] ] unit-test -[ [ 1 + ] ] [ 1 [ + ] '[ , @ ] ] unit-test +[ [ 1 + ] ] [ 1 [ + ] '[ _ @ ] ] unit-test -[ [ 1 + . ] ] [ 1 [ + ] '[ , @ . ] ] unit-test +[ [ 1 + . ] ] [ 1 [ + ] '[ _ @ . ] ] unit-test [ [ + - ] ] [ [ + ] [ - ] '[ @ @ ] ] unit-test [ [ "a" write "b" print ] ] -[ "a" "b" '[ , write , print ] ] unit-test +[ "a" "b" '[ _ write _ print ] ] unit-test [ [ 1 2 + 3 4 - ] ] [ [ + ] [ - ] '[ 1 2 @ 3 4 @ ] ] unit-test [ 1/2 ] [ - 1 '[ [ , ] dip / ] 2 swap call + 1 '[ [ _ ] dip / ] 2 swap call ] unit-test [ { { 1 "a" "A" } { 1 "b" "B" } { 1 "c" "C" } } ] [ - 1 '[ [ , ] 2dip 3array ] + 1 '[ [ _ ] 2dip 3array ] { "a" "b" "c" } { "A" "B" "C" } rot 2map ] unit-test @@ -33,7 +33,7 @@ sequences ; ] unit-test [ { { 1 "a" 2 } { 1 "b" 2 } { 1 "c" 2 } } ] [ - 1 2 '[ [ , ] dip , 3array ] + 1 2 '[ [ _ ] dip , 3array ] { "a" "b" "c" } swap map ] unit-test @@ -42,19 +42,19 @@ sequences ; [ "hi" 3 ] [ "h" "i" 3 [ append ] funny-dip ] unit-test [ { 1 2 3 } ] [ - 3 1 '[ , [ , + ] map ] call + 3 1 '[ _ [ _ + ] map ] call ] unit-test [ { 1 { 2 { 3 } } } ] [ - 1 2 3 '[ , [ , [ , 1array ] call 2array ] call 2array ] call + 1 2 3 '[ _ [ _ [ _ 1array ] call 2array ] call 2array ] call ] unit-test -{ 1 1 } [ '[ [ [ , ] ] ] ] must-infer-as +{ 1 1 } [ '[ [ [ _ ] ] ] ] must-infer-as [ { { { 3 } } } ] [ - 3 '[ [ [ , 1array ] call 1array ] call 1array ] call + 3 '[ [ [ _ 1array ] call 1array ] call 1array ] call ] unit-test [ { { { 3 } } } ] [ - 3 '[ [ [ , 1array ] call 1array ] call 1array ] call + 3 '[ [ [ _ 1array ] call 1array ] call 1array ] call ] unit-test diff --git a/basis/fry/fry.factor b/basis/fry/fry.factor index af7da07d27..712e1528cd 100755 --- a/basis/fry/fry.factor +++ b/basis/fry/fry.factor @@ -2,10 +2,9 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel sequences combinators parser splitting math quotations arrays make qualified words ; -QUALIFIED: make IN: fry -: , ( -- * ) "Only valid inside a fry" throw ; +: _ ( -- * ) "Only valid inside a fry" throw ; : @ ( -- * ) "Only valid inside a fry" throw ; r suffix r> (shallow-fry) ] } case ] if-empty ; : shallow-fry ( quot -- quot' ) [ ] swap (shallow-fry) ; -PREDICATE: fry-specifier < word { , make:, @ } memq? ; +PREDICATE: fry-specifier < word { _ @ , } memq? ; GENERIC: count-inputs ( quot -- n ) M: callable count-inputs [ count-inputs ] sigma ; -M: fry-specifier count-inputs drop 1 ; +M: fry-specifier count-inputs \ , eq? [ "Oops!!" throw ] when 1 ; M: object count-inputs drop 0 ; PRIVATE> @@ -48,8 +44,8 @@ PRIVATE> [ [ dup callable? [ - [ count-inputs \ , % ] [ fry % ] bi - ] [ make:, ] if + [ count-inputs \ _ % ] [ fry % ] bi + ] [ , ] if ] each ] [ ] make shallow-fry ; diff --git a/basis/furnace/actions/actions.factor b/basis/furnace/actions/actions.factor index 1370ae95b2..cce098f208 100755 --- a/basis/furnace/actions/actions.factor +++ b/basis/furnace/actions/actions.factor @@ -60,7 +60,7 @@ TUPLE: action rest authorize init display validate submit ; : handle-get ( action -- response ) '[ - , dup display>> [ + _ dup display>> [ { [ init>> call ] [ authorize>> call ] @@ -90,7 +90,7 @@ TUPLE: action rest authorize init display validate submit ; : handle-post ( action -- response ) '[ - , dup submit>> [ + _ dup submit>> [ [ validate>> call ] [ authorize>> call ] [ submit>> call ] @@ -133,4 +133,4 @@ TUPLE: page-action < action template ; : ( -- page ) page-action new-action - dup '[ , template>> ] >>display ; + dup '[ _ template>> ] >>display ; diff --git a/basis/furnace/alloy/alloy.factor b/basis/furnace/alloy/alloy.factor index 29cb37b557..6f5f6fdbf6 100644 --- a/basis/furnace/alloy/alloy.factor +++ b/basis/furnace/alloy/alloy.factor @@ -14,7 +14,7 @@ IN: furnace.alloy '[ - , , + _ _ ] call ; @@ -26,5 +26,5 @@ IN: furnace.alloy : start-expiring ( db params -- ) '[ - , , [ state-classes [ expire-state ] each ] with-db + _ _ [ state-classes [ expire-state ] each ] with-db ] 5 minutes every drop ; diff --git a/basis/furnace/auth/auth.factor b/basis/furnace/auth/auth.factor index 54e936a313..8e18c18df9 100755 --- a/basis/furnace/auth/auth.factor +++ b/basis/furnace/auth/auth.factor @@ -125,7 +125,7 @@ TUPLE: secure-realm-only < filter-responder ; C: secure-realm-only M: secure-realm-only call-responder* - '[ , , call-next-method ] if-secure-realm ; + '[ _ _ call-next-method ] if-secure-realm ; TUPLE: protected < filter-responder description capabilities ; diff --git a/basis/furnace/auth/basic/basic.factor b/basis/furnace/auth/basic/basic.factor index ff3c302b40..a9b367c5c9 100755 --- a/basis/furnace/auth/basic/basic.factor +++ b/basis/furnace/auth/basic/basic.factor @@ -1,6 +1,6 @@ ! Copyright (c) 2007 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors kernel splitting base64 namespaces strings +USING: accessors kernel splitting base64 namespaces make strings http http.server.responses furnace.auth ; IN: furnace.auth.basic diff --git a/basis/furnace/auth/features/recover-password/recover-password.factor b/basis/furnace/auth/features/recover-password/recover-password.factor index 77915f1083..a0fd05c6d4 100644 --- a/basis/furnace/auth/features/recover-password/recover-password.factor +++ b/basis/furnace/auth/features/recover-password/recover-password.factor @@ -1,7 +1,7 @@ ! Copyright (c) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: namespaces accessors kernel assocs arrays io.sockets threads -fry urls smtp validators html.forms present +USING: namespaces make accessors kernel assocs arrays io.sockets +threads fry urls smtp validators html.forms present http http.server.responses http.server.redirection http.server.dispatchers furnace furnace.actions furnace.auth furnace.auth.providers @@ -43,7 +43,7 @@ SYMBOL: lost-password-from ] "" make >>body ; : send-password-email ( user -- ) - '[ , password-email send-email ] + '[ _ password-email send-email ] "E-mail send thread" spawn drop ; : ( -- action ) diff --git a/basis/furnace/chloe-tags/chloe-tags.factor b/basis/furnace/chloe-tags/chloe-tags.factor index e4286e3bdf..4e619ad534 100644 --- a/basis/furnace/chloe-tags/chloe-tags.factor +++ b/basis/furnace/chloe-tags/chloe-tags.factor @@ -56,7 +56,7 @@ CHLOE: write-atom drop [ write-atom-feeds ] [code] ; : compile-link-attrs ( tag -- ) #! Side-effects current namespace. - attrs>> '[ [ [ , ] dip link-attr ] each-responder ] [code] ; + attrs>> '[ [ [ _ ] dip link-attr ] each-responder ] [code] ; : a-start-tag ( tag -- ) [ compile-link-attrs ] [ compile-a-url ] bi @@ -72,7 +72,7 @@ CHLOE: a : compile-hidden-form-fields ( for -- ) '[ - , [ "," split [ hidden render ] each ] when* + _ [ "," split [ hidden render ] each ] when* nested-forms get " " join f like nested-forms-key hidden-form-field [ modify-form ] each-responder ] [code] ; diff --git a/basis/furnace/conversations/conversations.factor b/basis/furnace/conversations/conversations.factor index 26b62f9b07..1c28193de8 100644 --- a/basis/furnace/conversations/conversations.factor +++ b/basis/furnace/conversations/conversations.factor @@ -109,8 +109,8 @@ M: conversations call-responder* : restore-conversation ( seq -- ) conversation get dup [ namespace>> - [ '[ , key? ] filter ] - [ '[ [ , at ] keep set ] each ] + [ '[ _ key? ] filter ] + [ '[ [ _ at ] keep set ] each ] bi ] [ 2drop ] if ; diff --git a/basis/furnace/furnace.factor b/basis/furnace/furnace.factor index b90587fba8..6a798abb9f 100644 --- a/basis/furnace/furnace.factor +++ b/basis/furnace/furnace.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: namespaces assocs sequences kernel classes splitting +USING: namespaces make assocs sequences kernel classes splitting vocabs.loader accessors strings combinators arrays continuations present fry urls html.elements diff --git a/basis/furnace/redirection/redirection.factor b/basis/furnace/redirection/redirection.factor index 942cafd21a..ff3ce951cb 100644 --- a/basis/furnace/redirection/redirection.factor +++ b/basis/furnace/redirection/redirection.factor @@ -42,4 +42,4 @@ C: secure-only } cond ; inline M: secure-only call-responder* - '[ , , call-next-method ] if-secure ; + '[ _ _ call-next-method ] if-secure ; diff --git a/basis/furnace/syndication/syndication.factor b/basis/furnace/syndication/syndication.factor index 31a978aef3..396296bfac 100644 --- a/basis/furnace/syndication/syndication.factor +++ b/basis/furnace/syndication/syndication.factor @@ -44,7 +44,7 @@ TUPLE: feed-action < action title url entries ; feed-action new-action dup '[ feed new - , + _ [ title>> call >>title ] [ url>> call adjust-url relative-to-request >>url ] [ entries>> call process-entries >>entries ] diff --git a/basis/generalizations/generalizations.factor b/basis/generalizations/generalizations.factor index a3c86b6683..069d59cee1 100755 --- a/basis/generalizations/generalizations.factor +++ b/basis/generalizations/generalizations.factor @@ -6,24 +6,24 @@ math.ranges combinators macros quotations fry arrays ; IN: generalizations MACRO: nsequence ( n seq -- quot ) - [ drop ] [ '[ , , new-sequence ] ] 2bi - [ '[ @ [ , swap set-nth-unsafe ] keep ] ] reduce ; + [ drop ] [ '[ _ _ new-sequence ] ] 2bi + [ '[ @ [ _ swap set-nth-unsafe ] keep ] ] reduce ; MACRO: narray ( n -- quot ) - '[ , { } nsequence ] ; + '[ _ { } nsequence ] ; MACRO: firstn ( n -- ) dup zero? [ drop [ drop ] ] [ - [ [ '[ [ , ] dip nth-unsafe ] ] map ] - [ 1- '[ [ , ] dip bounds-check 2drop ] ] - bi prefix '[ , cleave ] + [ [ '[ [ _ ] dip nth-unsafe ] ] map ] + [ 1- '[ [ _ ] dip bounds-check 2drop ] ] + bi prefix '[ _ cleave ] ] if ; MACRO: npick ( n -- ) 1- dup saver [ dup ] rot [ r> swap ] n*quot 3append ; MACRO: ndup ( n -- ) - dup '[ , npick ] n*quot ; + dup '[ _ npick ] n*quot ; MACRO: nrot ( n -- ) 1- dup saver swap [ r> swap ] n*quot append ; @@ -41,7 +41,7 @@ MACRO: ntuck ( n -- ) 2 + [ dupd -nrot ] curry ; MACRO: nrev ( n -- quot ) - 1 [a,b] [ ] [ '[ @ , -nrot ] ] reduce ; + 1 [a,b] [ ] [ '[ @ _ -nrot ] ] reduce ; MACRO: ndip ( quot n -- ) dup saver -rot restorer 3append ; @@ -51,7 +51,7 @@ MACRO: nslip ( n -- ) MACRO: nkeep ( n -- ) [ ] [ 1+ ] [ ] tri - '[ [ , ndup ] dip , -nrot , nslip ] ; + '[ [ _ ndup ] dip _ -nrot _ nslip ] ; MACRO: ncurry ( n -- ) [ curry ] n*quot ; @@ -61,5 +61,5 @@ MACRO: nwith ( n -- ) MACRO: napply ( n -- ) 2 [a,b] - [ [ 1- ] keep '[ , ntuck , nslip ] ] + [ [ 1- ] keep '[ _ ntuck _ nslip ] ] map concat >quotation [ call ] append ; diff --git a/basis/help/lint/lint.factor b/basis/help/lint/lint.factor index facaa8a010..d49262e7c8 100755 --- a/basis/help/lint/lint.factor +++ b/basis/help/lint/lint.factor @@ -39,7 +39,7 @@ IN: help.lint $predicate $class-description $error-description - } swap '[ , elements empty? not ] contains? ; + } swap '[ _ elements empty? not ] contains? ; : check-values ( word element -- ) { @@ -110,7 +110,7 @@ M: help-error error. H{ } clone [ '[ dup >link where dup - [ first , at , push-at ] [ 2drop ] if + [ first _ at _ push-at ] [ 2drop ] if ] each ] keep ; diff --git a/basis/hints/hints.factor b/basis/hints/hints.factor index da6ab96959..499267de7c 100644 --- a/basis/hints/hints.factor +++ b/basis/hints/hints.factor @@ -21,7 +21,7 @@ IN: hints : specializer-cases ( quot word -- default alist ) dup [ array? ] all? [ 1array ] unless [ [ make-specializer ] keep - '[ , declare ] pick append + '[ _ declare ] pick append ] { } map>assoc ; : method-declaration ( method -- quot ) @@ -30,7 +30,7 @@ IN: hints bi prefix ; : specialize-method ( quot method -- quot' ) - method-declaration '[ , declare ] prepend ; + method-declaration '[ _ declare ] prepend ; : specialize-quot ( quot specializer -- quot' ) specializer-cases alist>quot ; diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor index 0969dd7ef3..6965cb582a 100644 --- a/basis/html/components/components.factor +++ b/basis/html/components/components.factor @@ -88,7 +88,7 @@ TUPLE: choice size multiple choices ; ; : render-options ( options selected -- ) - '[ dup , member? render-option ] each ; + '[ dup _ member? render-option ] each ; M: choice render*