Updating code for make and fry changes

diff --git a/basis/bootstrap/image/upload/upload.factor b/basis/bootstrap/image/upload/upload.factor
index de13b4aed43fc28b2e6e0d2908b2cbbe5f7d06ee..f0edf85e653e3a12d0d65d9e0814784f5f8935f7 100755 (executable)
--- 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
 ! 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
 
 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 9c1878e14d03309ae522d13f5f6f2aa263d951e3..1a7addac12583fcb5646e529951d40336f76db7a 100755 (executable)
--- 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
 ! 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
 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 ea1c6f5b39935a63a45c840a163c7683a37f5e4e..1f25efef24c72e6a5c03de1a3790bed5d902a642 100644 (file)
--- 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
 ! 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
 IN: checksums.common
 
 SYMBOL: bytes-read

diff --git a/basis/checksums/sha1/sha1.factor b/basis/checksums/sha1/sha1.factor
index 6aa2cfa2eb64cbf2405aa8055790c67c90dca107..bbae421b16fe0d1d86e86c9d44e3be955ec8a5d7 100755 (executable)
--- 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
 ! 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.
 IN: checksums.sha1
 
 ! Implemented according to RFC 3174.

diff --git a/basis/checksums/sha2/sha2.factor b/basis/checksums/sha2/sha2.factor
index ac93c052609950dc9011db999082266bb34877d8..0a6d8c26ab335c53b69f1af41e9da3e18355d766 100755 (executable)
--- 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.
 ! 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
 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 765fb65ef2a43c527ebaa13c3075c219d83ad6ae..7de1f24a3c6e04b1f0c57e287675a0e268d6cf6b 100644 (file)
--- 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*
     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
 
         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 <vector>
 
 : NSFastEnumeration-map ( object quot -- vector )
     NS-EACH-BUFFER-SIZE <vector>

-    [ '[ @ , push ] NSFastEnumeration-each ] keep ; inline
+    [ '[ @ _ push ] NSFastEnumeration-each ] keep ; inline

 
 : NSFastEnumeration>vector ( object -- vector )
     [ ] NSFastEnumeration-map ;
 
 : 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 a484e09de17b2af3d77946aee31308794c61394e..7b6c1d126da8fadc4c1fad0cb9d48b2599dc64eb 100755 (executable)
--- 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
      [ '[ 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 ;
 
 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
      [ '[ 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 ;
 
 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 2dd6e440d5d1f4a22f43a46ff129817337a24344..1558127293b6dac2a52e40e4da8dc77cc395320b 100755 (executable)
--- 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
 
         H{ } clone dependencies set
         H{ } clone generic-dependencies set
 

-        , {
+        _ {

             [ compile-begins ]
             [
                 [ build-tree-from-word ] [ compile-failed return ] recover
             [ 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 644b834117fc76ce3f000b6ced68445ad4e0fb90..a761c8ec1e13b1591f5b700e9b98f6d7c5a7e69f 100644 (file)
--- 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
 : 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 ] [
     contains-node? not ;
 
 [ f ] [

diff --git a/basis/compiler/tree/cleanup/cleanup.factor b/basis/compiler/tree/cleanup/cleanup.factor
index 44a6a11802d28ecf6cc464f301c32d6ee90a4b4d..58dc07d868d79f28a34391dfd62aedd627dabf68 100644 (file)
--- 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>> '[
 
 : delete-unreachable-branches ( #branch -- )
     dup live-branches>> '[

-        ,
+        _

         [ [ [ drop ] [ delete-nodes ] if ] 2each ]
         [ select-children ]
         2bi
         [ [ [ 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
 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 ;
 
     eliminate-phi
     live-branches off ;
 

diff --git a/basis/compiler/tree/combinators/combinators.factor b/basis/compiler/tree/combinators/combinators.factor
index 0f4dc3f2a348a2ce74a9c332b1767466128fef9f..f284a06a88d8873b5ff050b474dbdfd30b982b3f 100644 (file)
--- 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 '[
 
 : each-node ( nodes quot: ( node -- ) -- )
     dup dup '[

-        , [
+        _ [

             dup #branch? [
             dup #branch? [

-                children>> [ , each-node ] each
+                children>> [ _ each-node ] each

             ] [
                 dup #recursive? [
             ] [
                 dup #recursive? [

-                    child>> , each-node
+                    child>> _ each-node

                 ] [ drop ] if
             ] if
         ] bi
                 ] [ drop ] if
             ] if
         ] bi


@@ -21,22 +21,22 @@ IN: compiler.tree.combinators
     dup dup '[
         @
         dup #branch? [
     dup dup '[
         @
         dup #branch? [

-            [ [ , map-nodes ] map ] change-children
+            [ [ _ map-nodes ] map ] change-children

         ] [
             dup #recursive? [
         ] [
             dup #recursive? [

-                [ , map-nodes ] change-child
+                [ _ map-nodes ] change-child

             ] when
         ] if
     ] map flatten ; inline recursive
 
 : contains-node? ( nodes quot: ( node -- ? ) -- ? )
     dup dup '[
             ] when
         ] if
     ] map flatten ; inline recursive
 
 : contains-node? ( nodes quot: ( node -- ? ) -- ? )
     dup dup '[

-        , keep swap [ drop t ] [
+        _ keep swap [ drop t ] [

             dup #branch? [
             dup #branch? [

-                children>> [ , contains-node? ] contains?
+                children>> [ _ contains-node? ] contains?

             ] [
                 dup #recursive? [
             ] [
                 dup #recursive? [

-                    child>> , contains-node?
+                    child>> _ contains-node?

                 ] [ drop f ] if
             ] if
         ] if
                 ] [ 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 0014a1d4d74d2dd31194d7416a65f32350803a07..a19e49494ef6f37e6a5bd4db52bf76378de04a9f 100644 (file)
--- 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
 
 : 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
 
 : 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?
 : 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
     ] 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 ;
 
 : 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 9ebf064f79725338e9ba03b5720fcf3cae88c897..addb13ced3a2e8462e012899631aeca39545daeb 100755 (executable)
--- 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' )
 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
 
 : 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 01b91b1613331bbebbe45f7b8349cc2d1ddc99c1..691c564661b415c18544f2922b69fb9c4d1c3d95 100644 (file)
--- 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 -- )
 GENERIC: node>quot ( node -- )
 
 MACRO: match-choose ( alist -- )

-    [ '[ , ] ] assoc-map '[ , match-cond ] ;
+    [ [ ] curry ] assoc-map [ match-cond ] curry ;

 
 MATCH-VARS: ?a ?b ?c ;
 
 
 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 059ac1de02ba74fd037f64569e1bb59aa7ecc667..5aece23d1784a8933a8245b77ec86325ba50ae9a 100644 (file)
--- 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
 
 : 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 -- )
     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
     [ 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 ;
     ] bi ;

diff --git a/basis/compiler/tree/finalization/finalization.factor b/basis/compiler/tree/finalization/finalization.factor
index 540119f709665da38c31d3190e552022a82aa5c3..dafe032ab6afb68d57e7b08c725f1b4f2ddb3830 100644 (file)
--- 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 <reversed>
 MEMO: (tuple-boa-expansion) ( n -- quot )
     [
         [ 2 + ] map <reversed>

-        [ '[ [ , set-slot ] keep ] % ] each
+        [ '[ [ _ set-slot ] keep ] % ] each

     ] [ ] make ;
 
 : tuple-boa-expansion ( layout -- quot )
     ] [ ] make ;
 
 : tuple-boa-expansion ( layout -- quot )

diff --git a/basis/compiler/tree/normalization/normalization.factor b/basis/compiler/tree/normalization/normalization.factor
index 587dd6938b2eca6f7491b67093e63957568d0d98..b826a1590bfc09c0473b1f8169b2eb485f2489ee 100644 (file)
--- 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 ;
 
 : rename-values ( values -- values' )

-    rename-map get '[ [ , at ] keep or ] map ;
+    rename-map get '[ [ _ at ] keep or ] map ;

 
 GENERIC: rename-node-values* ( node -- node )
 
 
 GENERIC: rename-node-values* ( node -- node )
 


@@ -127,7 +127,7 @@ SYMBOL: introduction-stack
 
 : add-renamings ( old new -- )
     [ rename-values ] dip
 
 : 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 ;
 
 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>>
 
 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 [
 
 : (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 ]
 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*
     2bi ;
 
 M: #enter-recursive normalize*


@@ -181,14 +181,14 @@ M: #enter-recursive normalize*
 
 : call<return ( #call-recursive n -- nodes )
     neg dup make-values [
 
 : call<return ( #call-recursive n -- nodes )
     neg dup make-values [

-        [ pop-introductions '[ , prepend ] change-in-d ]
-        [ '[ , prepend ] change-out-d ]
+        [ pop-introductions '[ _ prepend ] change-in-d ]
+        [ '[ _ prepend ] change-out-d ]

         bi*
     ] [ introduction-stack [ prepend ] change ] bi ;
 
 : call>return ( #call-recursive n -- #call-recursive )
         bi*
     ] [ introduction-stack [ prepend ] change ] bi ;
 
 : call>return ( #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*
     2bi ;
 
 M: #call-recursive normalize*

diff --git a/basis/compiler/tree/propagation/branches/branches.factor b/basis/compiler/tree/propagation/branches/branches.factor
index f06f6792c78c00df22cee3078ecad6c2fb5ce6ac..c76217f8aed6bd171359baa33f7cd3253ee4ec18 100644 (file)
--- 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
 
 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 ;
 
 : live-children ( #branch -- children )
     [ children>> ] [ live-branches>> ] bi select-children ;


@@ -61,7 +61,7 @@ SYMBOL: infer-children-data
     infer-children-data get
     [
         '[
     infer-children-data get
     [
         '[

-            , [
+            _ [

                 dup +bottom+ eq?
                 [ drop null-info ] [ value-info ] if
             ] bind
                 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 d31de354d12687a920d62cce35dbef29e0f7bf5b..d208d3138909668457e1ae2d5b57a4deeda9e392 100644 (file)
--- 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 ( word interval-quot post-proc-quot -- )
     '[

-        [ binary-op-class ] [ , binary-op-interval ] 2bi
+        [ binary-op-class ] [ _ binary-op-interval ] 2bi

         @
         <class/interval-info>
     ] "outputs" set-word-prop ;
         @
         <class/interval-info>
     ] "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 -- )
     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
 
 comparison-ops

-[ dup '[ , define-comparison-constraints ] each-derived-op ] each
+[ dup '[ _ define-comparison-constraints ] each-derived-op ] each

 
 generic-comparison-ops [
     dup specific-comparison
 
 generic-comparison-ops [
     dup specific-comparison

-    '[ , , define-comparison-constraints ] each-derived-op
+    '[ _ _ define-comparison-constraints ] each-derived-op

 ] each
 
 ! Remove redundant comparisons
 ] each
 
 ! Remove redundant comparisons


@@ -179,13 +179,13 @@ generic-comparison-ops [
 
 comparison-ops [
     dup '[
 
 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
     ] 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 )
 ] each
 
 : maybe-or-never ( ? -- info )


@@ -221,7 +221,7 @@ generic-comparison-ops [
     { >float float }
 } [
     '[
     { >float float }
 } [
     '[

-        ,
+        _

         [ nip ] [
             [ interval>> ] [ class-interval ] bi*
             interval-intersect
         [ 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 809a85a51fd3ba032e13325cb20c433b494ec18a..7fc38239f1cfb56f2e247b4116c00602d3a9485d 100644 (file)
--- 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 )
     [ 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 [ <literal-info> ] map nip ]
+    [ [ out-d>> ] [ in-d>> [ value-info literal>> ] map ] bi ] [ '[ _ execute ] ] bi*
+    '[ _ _ with-datastack [ <literal-info> ] map nip ]

     [ drop [ object-info ] replicate ]
     recover ;
 
     [ drop [ object-info ] replicate ]
     recover ;
 

diff --git a/basis/compiler/tree/tree.factor b/basis/compiler/tree/tree.factor
index b6c798ca3ca840ecb105d6ea96ed4a3b4a31ada2..05f33902ecd805b6d52c90a14e16f52d181e871f 100755 (executable)
--- 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
 
 : shuffle-effect ( #shuffle -- effect )
     [ in-d>> ] [ out-d>> ] [ mapping>> ] tri

-    '[ , at ] map
+    '[ _ at ] map

     <effect> ;
 
 : recursive-phi-in ( #enter-recursive -- seq )
     <effect> ;
 
 : 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 b881f5a974ee096e1c19b47326a7edd090526966..1b442662d57c9d19380880d977733a541853201f 100644 (file)
--- 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.
 ! 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
 
 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 59a3f218634f3fea71f8c78a13de7144f6902282..133223b6e4787c0c37b0a8a2e2410a68b087dea6 100644 (file)
--- a/basis/csv/csv.factor
+++ b/basis/csv/csv.factor
@@ -4,7 +4,8 @@
 ! Simple CSV Parser
 ! Phil Dawes phil@phildawes.net
 
 ! 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
 IN: csv
 
 SYMBOL: delimiter

diff --git a/basis/db/postgresql/postgresql.factor b/basis/db/postgresql/postgresql.factor
index ae31b168cb0916b88a410915a8bd831055934a98..38fa4cc715227d59ca01ad11a634f56ec2908db3 100755 (executable)
--- 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
 ! 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
 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 ede7612942948d544afff8d2cb3c1c1f6a33bb00..89c28b52623d627876c9648038d4b30be425c370 100644 (file)
--- 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.
 ! 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 -- )
 IN: db.queries
 
 GENERIC: where ( specs obj -- )

diff --git a/basis/db/tuples/tuples-docs.factor b/basis/db/tuples/tuples-docs.factor
index ed605da25f97d05a4d74725fa7f39773fd8c2c8d..26ecec03656dd3d3a04db21a53a0c945b0316a5d 100644 (file)
--- 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 -- )
 "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
 
 [
     book recreate-table

diff --git a/basis/db/tuples/tuples-tests.factor b/basis/db/tuples/tuples-tests.factor
index 3b044549959e1288c0a874f55275054bbe0fd4be..67e46f9e1825651d1989c55dfa114cedb28371fb 100755 (executable)
--- 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 -- )
 ! ] 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 -- )
 
 : 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
 
 : 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 4ef787d33b7a98f3fa1808561404976f4959a249..ea246cfa28e73859e7062f7725b6dcabbf72f9b4 100644 (file)
--- 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 ;
 
     [ 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 -- ? )
 
 
 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 -- )
     ] if ;
 
 : equate-all-with ( seq a disjoint-set -- )

-    '[ , , equate ] each ;
+    '[ _ _ equate ] each ;

 
 : equate-all ( seq disjoint-set -- )
     over empty? [ 2drop ] [
 
 : equate-all ( seq disjoint-set -- )
     over empty? [ 2drop ] [


@@ -102,7 +102,7 @@ M: disjoint-set clone
 
 : assoc>disjoint-set ( assoc -- disjoint-set )
     <disjoint-set>
 
 : assoc>disjoint-set ( assoc -- disjoint-set )
     <disjoint-set>

-    [ '[ drop , add-atom ] assoc-each ]
-    [ '[ , equate ] assoc-each ]
+    [ '[ drop _ add-atom ] assoc-each ]
+    [ '[ _ equate ] assoc-each ]

     [ nip ]
     2tri ;
     [ nip ]
     2tri ;

diff --git a/basis/fry/fry-docs.factor b/basis/fry/fry-docs.factor
index 4f33a6892a30be49276ad3bb657d9d6bf183b86e..286dbb469ef98eded169bab8b8ca981a1e6e06e2 100755 (executable)
--- a/basis/fry/fry-docs.factor
+++ b/basis/fry/fry-docs.factor
@@ -1,7 +1,7 @@
 USING: help.markup help.syntax quotations kernel ;\r
 IN: fry\r
 \r
 USING: help.markup help.syntax quotations kernel ;\r
 IN: fry\r
 \r

-HELP: ,\r
+HELP: _\r

 { $description "Fry specifier. Inserts a literal value into the fried quotation." } ;\r
 \r
 HELP: @\r
 { $description "Fry specifier. Inserts a literal value into the fried quotation." } ;\r
 \r
 HELP: @\r


@@ -16,7 +16,7 @@ HELP: fry
 \r
 HELP: '[\r
 { $syntax "code... ]" }\r
 \r
 HELP: '[\r
 { $syntax "code... ]" }\r

-{ $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 @ } "." }\r
+{ $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 @ } "." }\r

 { $examples "See " { $link "fry.examples" } "." } ;\r
 \r
 ARTICLE: "fry.examples" "Examples of fried quotations"\r
 { $examples "See " { $link "fry.examples" } "." } ;\r
 \r
 ARTICLE: "fry.examples" "Examples of fried quotations"\r


@@ -24,49 +24,49 @@ ARTICLE: "fry.examples" "Examples of fried quotations"
 $nl\r
 "If a quotation does not contain any fry specifiers, then " { $link POSTPONE: '[ } " behaves just like " { $link POSTPONE: [ } ":"\r
 { $code "{ 10 20 30 } '[ . ] each" }\r
 $nl\r
 "If a quotation does not contain any fry specifiers, then " { $link POSTPONE: '[ } " behaves just like " { $link POSTPONE: [ } ":"\r
 { $code "{ 10 20 30 } '[ . ] each" }\r

-"Occurrences of " { $link , } " on the left map directly to " { $link curry } ". That is, the following three lines are equivalent:"\r
+"Occurrences of " { $link _ } " on the left map directly to " { $link curry } ". That is, the following three lines are equivalent:"\r

 { $code \r
 { $code \r

-    "{ 10 20 30 } 5 '[ , + ] map"\r
+    "{ 10 20 30 } 5 '[ _ + ] map"\r

     "{ 10 20 30 } 5 [ + ] curry map"\r
     "{ 10 20 30 } [ 5 + ] map"\r
 }\r
     "{ 10 20 30 } 5 [ + ] curry map"\r
     "{ 10 20 30 } [ 5 + ] map"\r
 }\r

-"Occurrences of " { $link , } " in the middle of a quotation map to more complex quotation composition patterns. The following three lines are equivalent:"\r
+"Occurrences of " { $link _ } " in the middle of a quotation map to more complex quotation composition patterns. The following three lines are equivalent:"\r

 { $code \r
 { $code \r

-    "{ 10 20 30 } 5 '[ 3 , / ] map"\r
+    "{ 10 20 30 } 5 '[ 3 _ / ] map"\r

     "{ 10 20 30 } 5 [ 3 ] swap [ / ] curry compose map"\r
     "{ 10 20 30 } [ 3 5 / ] map"\r
 }\r
     "{ 10 20 30 } 5 [ 3 ] swap [ / ] curry compose map"\r
     "{ 10 20 30 } [ 3 5 / ] map"\r
 }\r

-"Occurrences of " { $link @ } " are simply syntax sugar for " { $snippet ", call" } ". The following four lines are equivalent:"\r
+"Occurrences of " { $link @ } " are simply syntax sugar for " { $snippet "_ call" } ". The following four lines are equivalent:"\r

 { $code \r
     "{ 10 20 30 } [ sq ] '[ @ . ] each"\r
     "{ 10 20 30 } [ sq ] [ call . ] curry each"\r
     "{ 10 20 30 } [ sq ] [ . ] compose each"\r
     "{ 10 20 30 } [ sq . ] each"\r
 }\r
 { $code \r
     "{ 10 20 30 } [ sq ] '[ @ . ] each"\r
     "{ 10 20 30 } [ sq ] [ call . ] curry each"\r
     "{ 10 20 30 } [ sq ] [ . ] compose each"\r
     "{ 10 20 30 } [ sq . ] each"\r
 }\r

-"The " { $link , } " and " { $link @ } " specifiers may be freely mixed:"\r
+"The " { $link _ } " and " { $link @ } " specifiers may be freely mixed:"\r

 { $code\r
 { $code\r

-    "{ 8 13 14 27 } [ even? ] 5 '[ @ dup , ? ] map"\r
+    "{ 8 13 14 27 } [ even? ] 5 '[ @ dup _ ? ] map"\r

     "{ 8 13 14 27 } [ even? ] 5 [ dup ] swap [ ? ] curry 3compose map"\r
     "{ 8 13 14 27 } [ even? dup 5 ? ] map"\r
 }\r
 "Here are some built-in combinators rewritten in terms of fried quotations:"\r
 { $table\r
     "{ 8 13 14 27 } [ even? ] 5 [ dup ] swap [ ? ] curry 3compose map"\r
     "{ 8 13 14 27 } [ even? dup 5 ? ] map"\r
 }\r
 "Here are some built-in combinators rewritten in terms of fried quotations:"\r
 { $table\r

-    { { $link literalize } { $snippet ": literalize '[ , ] ;" } }\r
-    { { $link slip } { $snippet ": slip '[ @ , ] call ;" } }\r
-    { { $link curry } { $snippet ": curry '[ , @ ] ;" } }\r
+    { { $link literalize } { $snippet ": literalize '[ _ ] ;" } }\r
+    { { $link slip } { $snippet ": slip '[ @ _ ] call ;" } }\r
+    { { $link curry } { $snippet ": curry '[ _ @ ] ;" } }\r

     { { $link compose } { $snippet ": compose '[ @ @ ] ;" } }\r
     { { $link compose } { $snippet ": compose '[ @ @ ] ;" } }\r

-    { { $link bi@ } { $snippet ": bi@ tuck '[ , @ , @ ] call ;" } }\r
+    { { $link bi@ } { $snippet ": bi@ tuck '[ _ @ _ @ ] call ;" } }\r

 } ;\r
 \r
 ARTICLE: "fry.philosophy" "Fried quotation philosophy"\r
 "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:"\r
 { $code\r
 } ;\r
 \r
 ARTICLE: "fry.philosophy" "Fried quotation philosophy"\r
 "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:"\r
 { $code\r

-    "'[ [ , key? ] all? ] filter"\r
+    "'[ [ _ key? ] all? ] filter"\r

     "[ [ key? ] curry all? ] curry filter"\r
 }\r
 "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:"\r
 { $code\r
     "[ [ key? ] curry all? ] curry filter"\r
 }\r
 "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:"\r
 { $code\r

-    "'[ 3 , + 4 , / ]"\r
+    "'[ 3 _ + 4 _ / ]"\r

     "[let | a [ ] b [ ] | [ 3 a + 4 b / ] ]"\r
 } ;\r
 \r
     "[let | a [ ] b [ ] | [ 3 a + 4 b / ] ]"\r
 } ;\r
 \r


@@ -79,7 +79,7 @@ $nl
 "Fried quotations are denoted with a special parsing word:"\r
 { $subsection POSTPONE: '[ }\r
 "Fried quotations contain zero or more " { $emphasis "fry specifiers" } ":"\r
 "Fried quotations are denoted with a special parsing word:"\r
 { $subsection POSTPONE: '[ }\r
 "Fried quotations contain zero or more " { $emphasis "fry specifiers" } ":"\r

-{ $subsection , }\r
+{ $subsection _ }\r

 { $subsection @ }\r
 "When a fried quotation is being evaluated, values are consumed from the stack and spliced into the quotation from right to left."\r
 { $subsection "fry.examples" }\r
 { $subsection @ }\r
 "When a fried quotation is being evaluated, values are consumed from the stack and spliced into the quotation from right to left."\r
 { $subsection "fry.examples" }\r

diff --git a/basis/fry/fry-tests.factor b/basis/fry/fry-tests.factor
index b8cdbc8cd746f9e278628fdaa8f6f77b54850121..5c5908416da92d67fdfe67966c04d73ac99d6920 100755 (executable)
--- 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 ;
 
 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 ] ]
 
 [ [ + - ] ] [ [ + ] [ - ] '[ @ @ ] ] 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 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" } } ] [
 ] 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
 
     { "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 } } ] [
 ] 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
 
     { "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 } ] [
 [ "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 } } } ] [
 ] 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
 
 ] unit-test
 

-{ 1 1 } [ '[ [ [ , ] ] ] ] must-infer-as
+{ 1 1 } [ '[ [ [ _ ] ] ] ] must-infer-as

 
 [ { { { 3 } } } ] [
 
 [ { { { 3 } } } ] [

-    3 '[ [ [ , 1array ] call 1array ] call 1array ] call
+    3 '[ [ [ _ 1array ] call 1array ] call 1array ] call

 ] unit-test
 
 [ { { { 3 } } } ] [
 ] unit-test
 
 [ { { { 3 } } } ] [

-    3 '[ [ [ , 1array ] call 1array ] call 1array ] call
+    3 '[ [ [ _ 1array ] call 1array ] call 1array ] call

 ] unit-test
 ] unit-test

diff --git a/basis/fry/fry.factor b/basis/fry/fry.factor
index af7da07d27ec80211845c23108e653cd5e05d1c9..712e1528cd9c8ea50f18bd47681bf95a43dc49e0 100755 (executable)
--- 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 ;
 ! 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
 
 IN: fry
 

-: , ( -- * ) "Only valid inside a fry" throw ;
+: _ ( -- * ) "Only valid inside a fry" throw ;

 : @ ( -- * ) "Only valid inside a fry" throw ;
 
 <PRIVATE
 : @ ( -- * ) "Only valid inside a fry" throw ;
 
 <PRIVATE


@@ -22,24 +21,21 @@ DEFER: shallow-fry
 : (shallow-fry) ( accum quot -- result )
     [ 1quotation ] [
         unclip {
 : (shallow-fry) ( accum quot -- result )
     [ 1quotation ] [
         unclip {

-            { \ , [ [ curry ] ((shallow-fry)) ] }
+            { \ , [ "Oops!!" throw ] }
+            { \ _ [ [ curry ] ((shallow-fry)) ] }

             { \ @ [ [ compose ] ((shallow-fry)) ] }
             { \ @ [ [ compose ] ((shallow-fry)) ] }

-
-            ! to avoid confusion, remove if fry goes core
-            { \ make:, [ [ curry ] ((shallow-fry)) ] }
-

             [ swap >r suffix r> (shallow-fry) ]
         } case
     ] if-empty ;
 
 : shallow-fry ( quot -- quot' ) [ ] swap (shallow-fry) ;
 
             [ swap >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 ;
 
 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>
 M: object count-inputs drop 0 ;
 
 PRIVATE>


@@ -48,8 +44,8 @@ PRIVATE>
     [
         [
             dup callable? [
     [
         [
             dup callable? [

-                [ count-inputs \ , <repetition> % ] [ fry % ] bi
-            ] [ make:, ] if
+                [ count-inputs \ _ <repetition> % ] [ fry % ] bi
+            ] [ , ] if

         ] each
     ] [ ] make shallow-fry ;
 
         ] each
     ] [ ] make shallow-fry ;
 

diff --git a/basis/furnace/actions/actions.factor b/basis/furnace/actions/actions.factor
index 1370ae95b2f02653e6d201e0ce138f328bbca688..cce098f208cfe9ab5c018eec2cf176a46d953f84 100755 (executable)
--- a/basis/furnace/actions/actions.factor
+++ b/basis/furnace/actions/actions.factor
@@ -60,7 +60,7 @@ TUPLE: action rest authorize init display validate submit ;
 \r
 : handle-get ( action -- response )\r
     '[\r
 \r
 : handle-get ( action -- response )\r
     '[\r

-        , dup display>> [\r
+        _ dup display>> [\r

             {\r
                 [ init>> call ]\r
                 [ authorize>> call ]\r
             {\r
                 [ init>> call ]\r
                 [ authorize>> call ]\r


@@ -90,7 +90,7 @@ TUPLE: action rest authorize init display validate submit ;
 \r
 : handle-post ( action -- response )\r
     '[\r
 \r
 : handle-post ( action -- response )\r
     '[\r

-        , dup submit>> [\r
+        _ dup submit>> [\r

             [ validate>> call ]\r
             [ authorize>> call ]\r
             [ submit>> call ]\r
             [ validate>> call ]\r
             [ authorize>> call ]\r
             [ submit>> call ]\r


@@ -133,4 +133,4 @@ TUPLE: page-action < action template ;
 \r
 : <page-action> ( -- page )\r
     page-action new-action\r
 \r
 : <page-action> ( -- page )\r
     page-action new-action\r

-        dup '[ , template>> <chloe-content> ] >>display ;\r
+        dup '[ _ template>> <chloe-content> ] >>display ;\r

diff --git a/basis/furnace/alloy/alloy.factor b/basis/furnace/alloy/alloy.factor
index 29cb37b557d79eb17a6683d2480fc3b3aa8f6c9a..6f5f6fdbf61ba6f6f3d514b7d43f9e26cab17d88 100644 (file)
--- a/basis/furnace/alloy/alloy.factor
+++ b/basis/furnace/alloy/alloy.factor
@@ -14,7 +14,7 @@ IN: furnace.alloy
     '[
         <conversations>
         <sessions>
     '[
         <conversations>
         <sessions>

-        , , <db-persistence>
+        _ _ <db-persistence>

         <check-form-submissions>
     ] call ;
 
         <check-form-submissions>
     ] call ;
 


@@ -26,5 +26,5 @@ IN: furnace.alloy
 
 : start-expiring ( db params -- )
     '[
 
 : start-expiring ( db params -- )
     '[

-        , , [ state-classes [ expire-state ] each ] with-db
+        _ _ [ state-classes [ expire-state ] each ] with-db

     ] 5 minutes every drop ;
     ] 5 minutes every drop ;

diff --git a/basis/furnace/auth/auth.factor b/basis/furnace/auth/auth.factor
index 54e936a3138f5bc104cbf670dd9903d429273dce..8e18c18df9fdd744025767565ce5af0df67c5e43 100755 (executable)
--- 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> secure-realm-only\r
 \r
 M: secure-realm-only call-responder*\r
 C: <secure-realm-only> secure-realm-only\r
 \r
 M: secure-realm-only call-responder*\r

-    '[ , , call-next-method ] if-secure-realm ;\r
+    '[ _ _ call-next-method ] if-secure-realm ;\r

 \r
 TUPLE: protected < filter-responder description capabilities ;\r
 \r
 \r
 TUPLE: protected < filter-responder description capabilities ;\r
 \r

diff --git a/basis/furnace/auth/basic/basic.factor b/basis/furnace/auth/basic/basic.factor
index ff3c302b40addc7d4d5f59e205b424cd2cad21de..a9b367c5c99b1c07c33ecd9b6ee1980a61bce8e2 100755 (executable)
--- a/basis/furnace/auth/basic/basic.factor
+++ b/basis/furnace/auth/basic/basic.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Chris Double.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 ! Copyright (c) 2007 Chris Double.\r
 ! See http://factorcode.org/license.txt for BSD license.\r

-USING: accessors kernel splitting base64 namespaces strings\r
+USING: accessors kernel splitting base64 namespaces make strings\r

 http http.server.responses furnace.auth ;\r
 IN: furnace.auth.basic\r
 \r
 http http.server.responses furnace.auth ;\r
 IN: furnace.auth.basic\r
 \r

diff --git a/basis/furnace/auth/features/recover-password/recover-password.factor b/basis/furnace/auth/features/recover-password/recover-password.factor
index 77915f10831c8d1cbee20a5b983dd46be5e994e6..a0fd05c6d49d62d5af59623e05b8214c0b59d307 100644 (file)
--- 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.
 ! 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
 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 -- )
         ] "" make >>body ;
 
 : send-password-email ( user -- )

-    '[ , password-email send-email ]
+    '[ _ password-email send-email ]

     "E-mail send thread" spawn drop ;
 
 : <recover-action-1> ( -- action )
     "E-mail send thread" spawn drop ;
 
 : <recover-action-1> ( -- action )

diff --git a/basis/furnace/chloe-tags/chloe-tags.factor b/basis/furnace/chloe-tags/chloe-tags.factor
index e4286e3bdf0624b4b6498287909342345275b3f6..4e619ad534b191eba8530527b821a3e41a46174c 100644 (file)
--- 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.
 
 : 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
 
 : a-start-tag ( tag -- )
     [ compile-link-attrs ] [ compile-a-url ] bi


@@ -72,7 +72,7 @@ CHLOE: a
 
 : compile-hidden-form-fields ( for -- )
     '[
 
 : 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] ;
         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 26b62f9b0778431e3d6a049524a316734796945a..1c28193de8e98b383fc227dddbb840d392a22119 100644 (file)
--- 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>>
 : restore-conversation ( seq -- )
     conversation get dup [
         namespace>>

-        [ '[ , key? ] filter ]
-        [ '[ [ , at ] keep set ] each ]
+        [ '[ _ key? ] filter ]
+        [ '[ [ _ at ] keep set ] each ]

         bi
     ] [ 2drop ] if ;
 
         bi
     ] [ 2drop ] if ;
 

diff --git a/basis/furnace/furnace.factor b/basis/furnace/furnace.factor
index b90587fba8ae10e3cd715aceaee62bdd72b72da0..6a798abb9fb5c6583fd9e5793abdc0c4805831d8 100644 (file)
--- 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.
 ! 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
 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 942cafd21a62d554d059ec99d1e8b41dc6bbee7a..ff3ce951cb2a69d72ac7af1921d5340e1cf2604e 100644 (file)
--- a/basis/furnace/redirection/redirection.factor
+++ b/basis/furnace/redirection/redirection.factor
@@ -42,4 +42,4 @@ C: <secure-only> secure-only
     } cond ; inline
 
 M: secure-only call-responder*
     } 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 31a978aef3d00c6fc524b439e7366cd5eb14cbb8..396296bfac27c9c84de49f83d7127f2ad54767d3 100644 (file)
--- 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
     feed-action new-action
         dup '[
             feed new

-                ,
+                _

                 [ title>> call >>title ]
                 [ url>> call adjust-url relative-to-request >>url ]
                 [ entries>> call process-entries >>entries ]
                 [ 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 a3c86b6683e6c51c770a49f6337e6f2068697e2f..069d59cee192a9ba2b60f7baa6fdcb702213abe2 100755 (executable)
--- a/basis/generalizations/generalizations.factor
+++ b/basis/generalizations/generalizations.factor
@@ -6,24 +6,24 @@ math.ranges combinators macros quotations fry arrays ;
 IN: generalizations\r
 \r
 MACRO: nsequence ( n seq -- quot )\r
 IN: generalizations\r
 \r
 MACRO: nsequence ( n seq -- quot )\r

-    [ drop <reversed> ] [ '[ , , new-sequence ] ] 2bi\r
-    [ '[ @ [ , swap set-nth-unsafe ] keep ] ] reduce ;\r
+    [ drop <reversed> ] [ '[ _ _ new-sequence ] ] 2bi\r
+    [ '[ @ [ _ swap set-nth-unsafe ] keep ] ] reduce ;\r

 \r
 MACRO: narray ( n -- quot )\r
 \r
 MACRO: narray ( n -- quot )\r

-    '[ , { } nsequence ] ;\r
+    '[ _ { } nsequence ] ;\r

 \r
 MACRO: firstn ( n -- )\r
     dup zero? [ drop [ drop ] ] [\r
 \r
 MACRO: firstn ( n -- )\r
     dup zero? [ drop [ drop ] ] [\r

-        [ [ '[ [ , ] dip nth-unsafe ] ] map ]\r
-        [ 1- '[ [ , ] dip bounds-check 2drop ] ]\r
-        bi prefix '[ , cleave ]\r
+        [ [ '[ [ _ ] dip nth-unsafe ] ] map ]\r
+        [ 1- '[ [ _ ] dip bounds-check 2drop ] ]\r
+        bi prefix '[ _ cleave ]\r

     ] if ;\r
 \r
 MACRO: npick ( n -- )\r
     1- dup saver [ dup ] rot [ r> swap ] n*quot 3append ;\r
 \r
 MACRO: ndup ( n -- )\r
     ] if ;\r
 \r
 MACRO: npick ( n -- )\r
     1- dup saver [ dup ] rot [ r> swap ] n*quot 3append ;\r
 \r
 MACRO: ndup ( n -- )\r

-    dup '[ , npick ] n*quot ;\r
+    dup '[ _ npick ] n*quot ;\r

 \r
 MACRO: nrot ( n -- )\r
     1- dup saver swap [ r> swap ] n*quot append ;\r
 \r
 MACRO: nrot ( n -- )\r
     1- dup saver swap [ r> swap ] n*quot append ;\r


@@ -41,7 +41,7 @@ MACRO: ntuck ( n -- )
     2 + [ dupd -nrot ] curry ;\r
 \r
 MACRO: nrev ( n -- quot )\r
     2 + [ dupd -nrot ] curry ;\r
 \r
 MACRO: nrev ( n -- quot )\r

-    1 [a,b] [ ] [ '[ @ , -nrot ] ] reduce ;\r
+    1 [a,b] [ ] [ '[ @ _ -nrot ] ] reduce ;\r

 \r
 MACRO: ndip ( quot n -- )\r
     dup saver -rot restorer 3append ;\r
 \r
 MACRO: ndip ( quot n -- )\r
     dup saver -rot restorer 3append ;\r


@@ -51,7 +51,7 @@ MACRO: nslip ( n -- )
 \r
 MACRO: nkeep ( n -- )\r
     [ ] [ 1+ ] [ ] tri\r
 \r
 MACRO: nkeep ( n -- )\r
     [ ] [ 1+ ] [ ] tri\r

-    '[ [ , ndup ] dip , -nrot , nslip ] ;\r
+    '[ [ _ ndup ] dip _ -nrot _ nslip ] ;\r

 \r
 MACRO: ncurry ( n -- )\r
     [ curry ] n*quot ;\r
 \r
 MACRO: ncurry ( n -- )\r
     [ curry ] n*quot ;\r


@@ -61,5 +61,5 @@ MACRO: nwith ( n -- )
 \r
 MACRO: napply ( n -- )\r
     2 [a,b]\r
 \r
 MACRO: napply ( n -- )\r
     2 [a,b]\r

-    [ [ 1- ] keep '[ , ntuck , nslip ] ]\r
+    [ [ 1- ] keep '[ _ ntuck _ nslip ] ]\r

     map concat >quotation [ call ] append ;\r
     map concat >quotation [ call ] append ;\r

diff --git a/basis/help/lint/lint.factor b/basis/help/lint/lint.factor
index facaa8a0109f540797a3f65259f9f0c75d321bd3..d49262e7c8e248572aaebdda9709cba38ecbc873 100755 (executable)
--- a/basis/help/lint/lint.factor
+++ b/basis/help/lint/lint.factor
@@ -39,7 +39,7 @@ IN: help.lint
         $predicate
         $class-description
         $error-description
         $predicate
         $class-description
         $error-description

-    } swap '[ , elements empty? not ] contains? ;
+    } swap '[ _ elements empty? not ] contains? ;

 
 : check-values ( word element -- )
     {
 
 : check-values ( word element -- )
     {


@@ -110,7 +110,7 @@ M: help-error error.
     H{ } clone [
         '[
             dup >link where dup
     H{ } clone [
         '[
             dup >link where dup

-            [ first , at , push-at ] [ 2drop ] if
+            [ first _ at _ push-at ] [ 2drop ] if

         ] each
     ] keep ;
 
         ] each
     ] keep ;
 

diff --git a/basis/hints/hints.factor b/basis/hints/hints.factor
index da6ab9695988bf824b5951f829255a82d2d634d4..499267de7c265ff790db4e5d40b57d7427242f9e 100644 (file)
--- 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
 : 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 )
     ] { } map>assoc ;
 
 : method-declaration ( method -- quot )


@@ -30,7 +30,7 @@ IN: hints
     bi prefix ;
 
 : specialize-method ( quot method -- quot' )
     bi prefix ;
 
 : specialize-method ( quot method -- quot' )

-    method-declaration '[ , declare ] prepend ;
+    method-declaration '[ _ declare ] prepend ;

 
 : specialize-quot ( quot specializer -- quot' )
     specializer-cases alist>quot ;
 
 : specialize-quot ( quot specializer -- quot' )
     specializer-cases alist>quot ;

diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor
index 0969dd7ef3e49be75e9570d2ef864bcc26540565..6965cb582a03a1801fba5ca3055d63aea3e4a638 100644 (file)
--- a/basis/html/components/components.factor
+++ b/basis/html/components/components.factor
@@ -88,7 +88,7 @@ TUPLE: choice size multiple choices ;
     </option> ;
 
 : render-options ( options selected -- )
     </option> ;
 
 : render-options ( options selected -- )

-    '[ dup , member? render-option ] each ;
+    '[ dup _ member? render-option ] each ;

 
 M: choice render*
     <select
 
 M: choice render*
     <select

diff --git a/basis/html/elements/elements.factor b/basis/html/elements/elements.factor
index 89f8b01a1979f75a3d331db0796b33aa0be0b9e2..ab9d987b6744f6643e5c3313bafc67fc2db8184f 100644 (file)
--- a/basis/html/elements/elements.factor
+++ b/basis/html/elements/elements.factor
@@ -70,7 +70,7 @@ SYMBOL: html
 : def-for-html-word-<foo> ( name -- )
     #! Return the name and code for the <foo> patterned
     #! word.
 : def-for-html-word-<foo> ( name -- )
     #! Return the name and code for the <foo> patterned
     #! word.

-    dup <foo> swap '[ , <foo> write-html ]
+    dup <foo> swap '[ _ <foo> write-html ]

     (( -- )) html-word ;
 
 : <foo ( str -- <str ) "<" prepend ;
     (( -- )) html-word ;
 
 : <foo ( str -- <str ) "<" prepend ;


@@ -78,7 +78,7 @@ SYMBOL: html
 : def-for-html-word-<foo ( name -- )
     #! Return the name and code for the <foo patterned
     #! word.
 : def-for-html-word-<foo ( name -- )
     #! Return the name and code for the <foo patterned
     #! word.

-    <foo dup '[ , write-html ]
+    <foo dup '[ _ write-html ]

     (( -- )) html-word ;
 
 : foo> ( str -- foo> ) ">" append ;
     (( -- )) html-word ;
 
 : foo> ( str -- foo> ) ">" append ;


@@ -93,14 +93,14 @@ SYMBOL: html
 : def-for-html-word-</foo> ( name -- )
     #! Return the name and code for the </foo> patterned
     #! word.
 : def-for-html-word-</foo> ( name -- )
     #! Return the name and code for the </foo> patterned
     #! word.

-    </foo> dup '[ , write-html ] (( -- )) html-word ;
+    </foo> dup '[ _ write-html ] (( -- )) html-word ;

 
 : <foo/> ( str -- <str/> ) "<" swap "/>" 3append ;
 
 : def-for-html-word-<foo/> ( name -- )
     #! Return the name and code for the <foo/> patterned
     #! word.
 
 : <foo/> ( str -- <str/> ) "<" swap "/>" 3append ;
 
 : def-for-html-word-<foo/> ( name -- )
     #! Return the name and code for the <foo/> patterned
     #! word.

-    dup <foo/> swap '[ , <foo/> write-html ]
+    dup <foo/> swap '[ _ <foo/> write-html ]

     (( -- )) html-word ;
 
 : foo/> ( str -- str/> ) "/>" append ;
     (( -- )) html-word ;
 
 : foo/> ( str -- str/> ) "/>" append ;


@@ -134,7 +134,7 @@ SYMBOL: html
 
 : define-attribute-word ( name -- )
     dup "=" prepend swap
 
 : define-attribute-word ( name -- )
     dup "=" prepend swap

-    '[ , write-attr ] (( string -- )) html-word ;
+    '[ _ write-attr ] (( string -- )) html-word ;

 
 ! Define some closed HTML tags
 [
 
 ! Define some closed HTML tags
 [

diff --git a/basis/html/forms/forms.factor b/basis/html/forms/forms.factor
index 34d6a4dcb2dac4f0ef618dcbd8d43b0d709a843e..7dd4b6146bee69be4bef25d24343641d3f4e0752 100644 (file)
--- a/basis/html/forms/forms.factor
+++ b/basis/html/forms/forms.factor
@@ -63,7 +63,7 @@ SYMBOL: nested-forms
 
 : with-form ( name quot -- )
     '[
 
 : with-form ( name quot -- )
     '[

-        ,
+        _

         [ nested-forms [ swap prefix ] change ]
         [ value form set ]
         bi
         [ nested-forms [ swap prefix ] change ]
         [ value form set ]
         bi


@@ -103,4 +103,4 @@ C: <validation-error> validation-error
     swap set-value ;
 
 : validate-values ( assoc validators -- assoc' )
     swap set-value ;
 
 : validate-values ( assoc validators -- assoc' )

-    swap '[ [ dup , at ] dip validate-value ] assoc-each ;
+    swap '[ [ dup _ at ] dip validate-value ] assoc-each ;

diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor
index 6a15b76bd3ab1b32718b5c5dd9535b06e2732f44..7d90296fcbfdc7dac29ed4fdca5f31afcdc42c83 100755 (executable)
--- a/basis/html/streams/streams.factor
+++ b/basis/html/streams/streams.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-
-USING: combinators generic assocs help http io io.styles io.files
-       continuations io.streams.string kernel math math.order math.parser
-       namespaces quotations assocs sequences strings words html.elements
-       xml.entities sbufs continuations destructors accessors arrays ;
-
+USING: combinators generic assocs help http io io.styles
+io.files continuations io.streams.string kernel math math.order
+math.parser namespaces make quotations assocs sequences strings
+words html.elements xml.entities sbufs continuations destructors
+accessors arrays ;

 IN: html.streams
 
 GENERIC: browser-link-href ( presented -- href )
 IN: html.streams
 
 GENERIC: browser-link-href ( presented -- href )

diff --git a/basis/html/templates/chloe/chloe.factor b/basis/html/templates/chloe/chloe.factor
index 45e59c3b6d06e880d95cf6db785111dbf2891071..5fe53fc7a503868b703a65c47d57e57d06df9e35 100644 (file)
--- a/basis/html/templates/chloe/chloe.factor
+++ b/basis/html/templates/chloe/chloe.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel sequences combinators kernel fry
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel sequences combinators kernel fry

-namespaces classes.tuple assocs splitting words arrays memoize
-io io.files io.encodings.utf8 io.streams.string unicode.case
-mirrors math urls present multiline quotations xml xml.data
+namespaces make classes.tuple assocs splitting words arrays
+memoize io io.files io.encodings.utf8 io.streams.string
+unicode.case mirrors math urls present multiline quotations xml
+xml.data

 html.forms
 html.elements
 html.components
 html.forms
 html.elements
 html.components

diff --git a/basis/html/templates/chloe/compiler/compiler.factor b/basis/html/templates/chloe/compiler/compiler.factor
index 044d2edb90b79bd76738059b05424cfdac3bb355..f32923f6207e922d8c7bd72489b5dd6d43a53f4c 100644 (file)
--- a/basis/html/templates/chloe/compiler/compiler.factor
+++ b/basis/html/templates/chloe/compiler/compiler.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: assocs namespaces kernel sequences accessors combinators
-strings splitting io io.streams.string present xml.writer
-xml.data xml.entities html.forms html.templates.chloe.syntax ;
+USING: assocs namespaces make kernel sequences accessors
+combinators strings splitting io io.streams.string present
+xml.writer xml.data xml.entities html.forms
+html.templates.chloe.syntax ;

 IN: html.templates.chloe.compiler
 
 : chloe-attrs-only ( assoc -- assoc' )
 IN: html.templates.chloe.compiler
 
 : chloe-attrs-only ( assoc -- assoc' )

diff --git a/basis/html/templates/chloe/components/components.factor b/basis/html/templates/chloe/components/components.factor
index e8703a123529ddf8a6fac2dd9cb17a29b8b5e7c4..77d7c937be5a29bb1ba0b0cf4c1042b343c1e72a 100644 (file)
--- a/basis/html/templates/chloe/components/components.factor
+++ b/basis/html/templates/chloe/components/components.factor
@@ -14,13 +14,13 @@ IN: html.templates.chloe.components
 
 : CHLOE-SINGLETON:
     scan-word
 
 : CHLOE-SINGLETON:
     scan-word

-    [ name>> ] [ '[ , singleton-component-tag ] ] bi
+    [ name>> ] [ '[ _ singleton-component-tag ] ] bi

     define-chloe-tag ;
     parsing
 
 : compile-component-attrs ( tag class -- )
     [ attrs>> [ drop main>> "name" = not ] assoc-filter ] dip
     define-chloe-tag ;
     parsing
 
 : compile-component-attrs ( tag class -- )
     [ attrs>> [ drop main>> "name" = not ] assoc-filter ] dip

-    [ all-slots swap '[ name>> , at compile-attr ] each ]
+    [ all-slots swap '[ name>> _ at compile-attr ] each ]

     [ [ boa ] [code-with] ]
     bi ;
 
     [ [ boa ] [code-with] ]
     bi ;
 


@@ -30,6 +30,6 @@ IN: html.templates.chloe.components
 
 : CHLOE-TUPLE:
     scan-word
 
 : CHLOE-TUPLE:
     scan-word

-    [ name>> ] [ '[ , tuple-component-tag ] ] bi
+    [ name>> ] [ '[ _ tuple-component-tag ] ] bi

     define-chloe-tag ;
     parsing
     define-chloe-tag ;
     parsing

diff --git a/basis/html/templates/fhtml/fhtml.factor b/basis/html/templates/fhtml/fhtml.factor
index e435fdce5f0b93987b29e51e0a7e5dfe58b765b0..7742ff9bc6369aa303ae48fe2545f929fc5963d7 100755 (executable)
--- a/basis/html/templates/fhtml/fhtml.factor
+++ b/basis/html/templates/fhtml/fhtml.factor
@@ -74,6 +74,6 @@ TUPLE: fhtml path ;
 C: <fhtml> fhtml
 
 M: fhtml call-template* ( filename -- )
 C: <fhtml> fhtml
 
 M: fhtml call-template* ( filename -- )

-    '[ , path>> utf8 file-contents eval-template ] assert-depth ;
+    '[ _ path>> utf8 file-contents eval-template ] assert-depth ;

 
 INSTANCE: fhtml template
 
 INSTANCE: fhtml template

diff --git a/basis/http/client/client.factor b/basis/http/client/client.factor
index 8dc1924a12163d3c2650cc40e340d961b66aec5f..5e22f5144d15e6879416a369631e2bf72770f7c9 100755 (executable)
--- a/basis/http/client/client.factor
+++ b/basis/http/client/client.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors assocs kernel math math.parser namespaces
+USING: accessors assocs kernel math math.parser namespaces make

 sequences io io.sockets io.streams.string io.files io.timeouts
 strings splitting calendar continuations accessors vectors
 math.order hashtables byte-arrays prettyprint
 sequences io io.sockets io.streams.string io.files io.timeouts
 strings splitting calendar continuations accessors vectors
 math.order hashtables byte-arrays prettyprint


@@ -95,7 +95,7 @@ DEFER: (http-request)
 SYMBOL: redirects
 
 : redirect-url ( request url -- request )
 SYMBOL: redirects
 
 : redirect-url ( request url -- request )

-    '[ , >url derive-url ensure-port ] change-url ;
+    '[ _ >url derive-url ensure-port ] change-url ;

 
 : do-redirect ( response data -- response data )
     over code>> 300 399 between? [
 
 : do-redirect ( response data -- response data )
     over code>> 300 399 between? [


@@ -169,7 +169,7 @@ M: download-failed error.
 : download-to ( url file -- )
     #! Downloads the contents of a URL to a file.
     swap http-get
 : download-to ( url file -- )
     #! Downloads the contents of a URL to a file.
     swap http-get

-    [ content-charset>> ] [ '[ , write ] ] bi*
+    [ content-charset>> ] [ '[ _ write ] ] bi*

     with-file-writer ;
 
 : download ( url -- )
     with-file-writer ;
 
 : download ( url -- )

diff --git a/basis/http/http.factor b/basis/http/http.factor
index d03d6c22036ab9c8d80ae188e1a5f1b52e7e5a4c..0cc228c73b841636f3eec96ecf719adca797bd15 100755 (executable)
--- a/basis/http/http.factor
+++ b/basis/http/http.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors kernel combinators math namespaces
+USING: accessors kernel combinators math namespaces make

 assocs sequences splitting sorting sets debugger
 strings vectors hashtables quotations arrays byte-arrays
 math.parser calendar calendar.format present
 assocs sequences splitting sorting sets debugger
 strings vectors hashtables quotations arrays byte-arrays
 math.parser calendar calendar.format present


@@ -28,7 +28,7 @@ IN: http
     [ read-crlf dup f like ] [ parse-header-line ] [ drop ] produce ;
 
 : collect-headers ( assoc -- assoc' )
     [ read-crlf dup f like ] [ parse-header-line ] [ drop ] produce ;
 
 : collect-headers ( assoc -- assoc' )

-    H{ } clone [ '[ , push-at ] assoc-each ] keep ;
+    H{ } clone [ '[ _ push-at ] assoc-each ] keep ;

 
 : process-header ( alist -- assoc )
     f swap [ [ swap or dup ] dip swap ] assoc-map nip
 
 : process-header ( alist -- assoc )
     f swap [ [ swap or dup ] dip swap ] assoc-map nip


@@ -196,7 +196,7 @@ M: response clone
         [ clone ] change-cookies ;
 
 : get-cookie ( request/response name -- cookie/f )
         [ clone ] change-cookies ;
 
 : get-cookie ( request/response name -- cookie/f )

-    [ cookies>> ] dip '[ [ , ] dip name>> = ] find nip ;
+    [ cookies>> ] dip '[ [ _ ] dip name>> = ] find nip ;

 
 : delete-cookie ( request/response name -- )
     over cookies>> [ get-cookie ] dip delete ;
 
 : delete-cookie ( request/response name -- )
     over cookies>> [ get-cookie ] dip delete ;

diff --git a/basis/http/parsers/parsers.factor b/basis/http/parsers/parsers.factor
index 2a31373951c47173143ccb228c8a2ab855340654..8e8e7358d1602eb273084f08eb47b286c9ba63d6 100644 (file)
--- a/basis/http/parsers/parsers.factor
+++ b/basis/http/parsers/parsers.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: combinators.short-circuit math math.order math.parser kernel
-sequences sequences.deep peg peg.parsers assocs arrays
-hashtables strings unicode.case namespaces ascii ;
+USING: combinators.short-circuit math math.order math.parser
+kernel sequences sequences.deep peg peg.parsers assocs arrays
+hashtables strings unicode.case namespaces make ascii ;

 IN: http.parsers
 
 : except ( quot -- parser )
 IN: http.parsers
 
 : except ( quot -- parser )

diff --git a/basis/http/server/cgi/cgi.factor b/basis/http/server/cgi/cgi.factor
index 354ebd8f704513accc98e4b64670bf3e3e074a90..0a3cb5cff34b67e693497f5f382d0918728a4a1f 100755 (executable)
--- a/basis/http/server/cgi/cgi.factor
+++ b/basis/http/server/cgi/cgi.factor
@@ -50,7 +50,7 @@ IN: http.server.cgi
     200 >>code\r
     "CGI output follows" >>message\r
     swap '[\r
     200 >>code\r
     "CGI output follows" >>message\r
     swap '[\r

-        , output-stream get swap <cgi-process> <process-stream> [\r
+        _ output-stream get swap <cgi-process> <process-stream> [\r

             post-request? [ request get post-data>> raw>> write flush ] when\r
             input-stream get swap (stream-copy)\r
         ] with-stream\r
             post-request? [ request get post-data>> raw>> write flush ] when\r
             input-stream get swap (stream-copy)\r
         ] with-stream\r

diff --git a/basis/http/server/server.factor b/basis/http/server/server.factor
index 436d626578ca2acf2793f48bdc310eae2706a146..bad1eb48311f55dbaf0e6fe99460394b1574e244 100755 (executable)
--- a/basis/http/server/server.factor
+++ b/basis/http/server/server.factor
@@ -158,7 +158,7 @@ main-responder global [ <404> <trivial-responder> or ] change-at
 
 : <500> ( error -- response )
     500 "Internal server error" <trivial-response>
 
 : <500> ( error -- response )
     500 "Internal server error" <trivial-response>

-    swap development? get [ '[ , http-error. ] >>body ] [ drop ] if ;
+    swap development? get [ '[ _ http-error. ] >>body ] [ drop ] if ;

 
 : do-response ( response -- )
     [ request get swap write-full-response ]
 
 : do-response ( response -- )
     [ request get swap write-full-response ]


@@ -198,7 +198,7 @@ LOG: httpd-header NOTICE
     [
         local-address get
         [ secure? "https" "http" ? >>protocol ]
     [
         local-address get
         [ secure? "https" "http" ? >>protocol ]

-        [ port>> '[ , or ] change-port ]
+        [ port>> '[ _ or ] change-port ]

         bi
     ] change-url drop ;
 
         bi
     ] change-url drop ;
 


@@ -207,7 +207,7 @@ LOG: httpd-header NOTICE
 
 : do-request ( request -- response )
     '[
 
 : do-request ( request -- response )
     '[

-        ,
+        _

         {
             [ init-request ]
             [ prepare-request ]
         {
             [ init-request ]
             [ prepare-request ]

diff --git a/basis/http/server/static/static.factor b/basis/http/server/static/static.factor
index dfbe93d86d7af82d74e2b9022448e892c95c6b60..b484e64368ada4a22dd8f1491bf88b2368afab30 100755 (executable)
--- a/basis/http/server/static/static.factor
+++ b/basis/http/server/static/static.factor
@@ -73,7 +73,7 @@ TUPLE: file-responder root hook special allow-listings ;
 \r
 : list-directory ( directory -- response )\r
     file-responder get allow-listings>> [\r
 \r
 : list-directory ( directory -- response )\r
     file-responder get allow-listings>> [\r

-        '[ , directory. ] "text/html" <content>\r
+        '[ _ directory. ] "text/html" <content>\r

     ] [\r
         drop <403>\r
     ] if ;\r
     ] [\r
         drop <403>\r
     ] if ;\r

diff --git a/basis/io/servers/connection/connection.factor b/basis/io/servers/connection/connection.factor
index f789f7b114b7a9e37ce5095cc5978ae16061448b..7d72659f6df82980540b4681bdbdf8e1078cf5c7 100755 (executable)
--- a/basis/io/servers/connection/connection.factor
+++ b/basis/io/servers/connection/connection.factor
@@ -67,7 +67,7 @@ M: threaded-server handle-client* handler>> call ;
 
 : handle-client ( client remote local -- )
     '[
 
 : handle-client ( client remote local -- )
     '[

-        , , log-connection
+        _ _ log-connection

         threaded-server get
         [ timeout>> timeouts ] [ handle-client* ] bi
     ] with-stream ;
         threaded-server get
         [ timeout>> timeouts ] [ handle-client* ] bi
     ] with-stream ;


@@ -77,7 +77,7 @@ M: threaded-server handle-client* handler>> call ;
 
 : accept-connection ( threaded-server -- )
     [ accept ] [ addr>> ] bi
 
 : accept-connection ( threaded-server -- )
     [ accept ] [ addr>> ] bi

-    [ '[ , , , handle-client ] ]
+    [ '[ _ _ _ handle-client ] ]

     [ drop threaded-server get name>> swap thread-name ] 2bi
     spawn drop ;
 
     [ drop threaded-server get name>> swap thread-name ] 2bi
     spawn drop ;
 

diff --git a/basis/io/servers/packet/datagram.factor b/basis/io/servers/packet/datagram.factor
index 758e85a777521d994e41910e6336f4ff1daa7330..c081dfb0fa368c66e7e45ec6399f3b5f4384db04 100644 (file)
--- a/basis/io/servers/packet/datagram.factor
+++ b/basis/io/servers/packet/datagram.factor
@@ -18,4 +18,4 @@ LOG: received-datagram NOTICE
 PRIVATE>
 
 : with-datagrams ( seq service quot -- )
 PRIVATE>
 
 : with-datagrams ( seq service quot -- )

-    '[ [ [ , ] dip spawn-datagrams ] parallel-each ] with-logging ; inline
+    '[ [ [ _ ] dip spawn-datagrams ] parallel-each ] with-logging ; inline

diff --git a/basis/json/reader/reader.factor b/basis/json/reader/reader.factor
index e21b1292e3141e7833e86fe117e2d54ecc035e1c..dd1ab8d5d8e1354b8065e62f662913a2ee05edac 100755 (executable)
--- a/basis/json/reader/reader.factor
+++ b/basis/json/reader/reader.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel parser-combinators namespaces sequences promises strings 
+USING: kernel parser-combinators namespaces make sequences promises strings 

        assocs math math.parser math.vectors math.functions math.order
        lists hashtables ascii accessors ;
 IN: json.reader
        assocs math math.parser math.vectors math.functions math.order
        lists hashtables ascii accessors ;
 IN: json.reader

diff --git a/basis/json/writer/writer.factor b/basis/json/writer/writer.factor
index 0d22494b13c7abdd62685293133f8d3e32cc634d..cbcf426545943e363da36bc0d851e38e72812040 100644 (file)
--- a/basis/json/writer/writer.factor
+++ b/basis/json/writer/writer.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel io.streams.string io strings splitting sequences math 
-       math.parser assocs classes words namespaces prettyprint
-       hashtables mirrors tr ;
+USING: kernel io.streams.string io strings splitting sequences
+math math.parser assocs classes words namespaces make
+prettyprint hashtables mirrors tr ;

 IN: json.writer
 
 #! Writes the object out to a stream in JSON format
 IN: json.writer
 
 #! Writes the object out to a stream in JSON format

diff --git a/basis/lcs/lcs.factor b/basis/lcs/lcs.factor
index 6f9ae3c88397f6047bedd9dd9d8b095acbf4356e..759e923a34b8eae56f203e9e68705864198dbff5 100755 (executable)
--- a/basis/lcs/lcs.factor
+++ b/basis/lcs/lcs.factor
@@ -1,5 +1,6 @@
 USING: sequences kernel math locals math.order math.ranges\r
 USING: sequences kernel math locals math.order math.ranges\r

-accessors arrays namespaces combinators combinators.short-circuit ;\r
+accessors arrays namespaces make combinators\r
+combinators.short-circuit ;\r

 IN: lcs\r
 \r
 <PRIVATE\r
 IN: lcs\r
 \r
 <PRIVATE\r

diff --git a/basis/logging/insomniac/insomniac.factor b/basis/logging/insomniac/insomniac.factor
index 79d9410994909a60e72893173317ef01101c2c95..7c1db5b7c0ca85cbddc3db4b7c830e47466e5c50 100755 (executable)
--- a/basis/logging/insomniac/insomniac.factor
+++ b/basis/logging/insomniac/insomniac.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 USING: logging.analysis logging.server logging smtp kernel\r
 ! Copyright (C) 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 USING: logging.analysis logging.server logging smtp kernel\r

-io.files io.streams.string namespaces alarms assocs\r
+io.files io.streams.string namespaces make alarms assocs\r

 io.encodings.utf8 accessors calendar sequences qualified ;\r
 QUALIFIED: io.sockets\r
 IN: logging.insomniac\r
 io.encodings.utf8 accessors calendar sequences qualified ;\r
 QUALIFIED: io.sockets\r
 IN: logging.insomniac\r

diff --git a/basis/logging/logging.factor b/basis/logging/logging.factor
index aa4e46fad19d69e390885ba2befeb289a974928b..ae9ef877dd74e79d9da34efa16ead6ea24dfaafd 100755 (executable)
--- a/basis/logging/logging.factor
+++ b/basis/logging/logging.factor
@@ -76,7 +76,7 @@ PRIVATE>
 : input# ( word -- n ) stack-effect in>> length ;\r
 \r
 : input-logging-quot ( quot word level -- quot' )\r
 : input# ( word -- n ) stack-effect in>> length ;\r
 \r
 : input-logging-quot ( quot word level -- quot' )\r

-    rot [ [ input# ] keep ] 2dip '[ , , , log-stack @ ] ;\r
+    rot [ [ input# ] keep ] 2dip '[ _ _ _ log-stack @ ] ;\r

 \r
 : add-input-logging ( word level -- )\r
     [ input-logging-quot ] (define-logging) ;\r
 \r
 : add-input-logging ( word level -- )\r
     [ input-logging-quot ] (define-logging) ;\r


@@ -84,7 +84,7 @@ PRIVATE>
 : output# ( word -- n ) stack-effect out>> length ;\r
 \r
 : output-logging-quot ( quot word level -- quot' )\r
 : output# ( word -- n ) stack-effect out>> length ;\r
 \r
 : output-logging-quot ( quot word level -- quot' )\r

-    [ [ output# ] keep ] dip '[ @ , , , log-stack ] ;\r
+    [ [ output# ] keep ] dip '[ @ _ _ _ log-stack ] ;\r

 \r
 : add-output-logging ( word level -- )\r
     [ output-logging-quot ] (define-logging) ;\r
 \r
 : add-output-logging ( word level -- )\r
     [ output-logging-quot ] (define-logging) ;\r


@@ -107,7 +107,7 @@ PRIVATE>
 \r
 : error-logging-quot ( quot word -- quot' )\r
     dup stack-effect stack-balancer\r
 \r
 : error-logging-quot ( quot word -- quot' )\r
     dup stack-effect stack-balancer\r

-    '[ , [ , log-error @ ] recover ] ;\r
+    '[ _ [ _ log-error @ ] recover ] ;\r

 \r
 : add-error-logging ( word level -- )\r
     [ [ input-logging-quot ] 2keep drop error-logging-quot ]\r
 \r
 : add-error-logging ( word level -- )\r
     [ [ input-logging-quot ] 2keep drop error-logging-quot ]\r


@@ -116,7 +116,7 @@ PRIVATE>
 : LOG:\r
     #! Syntax: name level\r
     CREATE-WORD dup scan-word\r
 : LOG:\r
     #! Syntax: name level\r
     CREATE-WORD dup scan-word\r

-    '[ 1array stack>message , , log-message ]\r
+    '[ 1array stack>message _ _ log-message ]\r

     (( message -- )) define-declared ; parsing\r
 \r
 USE: vocabs.loader\r
     (( message -- )) define-declared ; parsing\r
 \r
 USE: vocabs.loader\r

diff --git a/basis/logging/parser/parser.factor b/basis/logging/parser/parser.factor
index 24482432011b4410d47ae02325fc25af6c8d8c4c..07a84ec5c6973f3c02730f31d83dbe404370701a 100755 (executable)
--- a/basis/logging/parser/parser.factor
+++ b/basis/logging/parser/parser.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 USING: accessors peg peg.parsers memoize kernel sequences\r
 ! Copyright (C) 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 USING: accessors peg peg.parsers memoize kernel sequences\r

-logging arrays words strings vectors io io.files io.encodings.utf8\r
-namespaces combinators logging.server calendar calendar.format ;\r
+logging arrays words strings vectors io io.files\r
+io.encodings.utf8 namespaces make combinators logging.server\r
+calendar calendar.format ;\r

 IN: logging.parser\r
 \r
 TUPLE: log-entry date level word-name message ;\r
 IN: logging.parser\r
 \r
 TUPLE: log-entry date level word-name message ;\r

diff --git a/basis/math/bitwise/bitwise.factor b/basis/math/bitwise/bitwise.factor
index 60c585c779471536ebc86eb79903e9eaaa547ae3..871f40e74c9d7b9a58ccf9513c3e4717c245bb8f 100644 (file)
--- a/basis/math/bitwise/bitwise.factor
+++ b/basis/math/bitwise/bitwise.factor
@@ -69,7 +69,7 @@ DEFER: byte-bit-count
 \ byte-bit-count
 256 [
     0 swap [ [ 1+ ] when ] each-bit
 \ byte-bit-count
 256 [
     0 swap [ [ 1+ ] when ] each-bit

-] B{ } map-as '[ HEX: ff bitand , nth-unsafe ] define-inline
+] B{ } map-as '[ HEX: ff bitand _ nth-unsafe ] define-inline

 
 >>
 
 
 >>
 

diff --git a/basis/mime-types/mime-types.factor b/basis/mime-types/mime-types.factor
index 42b8f2e739b53fb6117fde78413198bfac48ab9d..909f762c504b4a1a5eb4f9695d23697ecdfedc1e 100755 (executable)
--- a/basis/mime-types/mime-types.factor
+++ b/basis/mime-types/mime-types.factor
@@ -17,7 +17,7 @@ MEMO: mime-db ( -- seq )
 
 MEMO: mime-types ( -- assoc )
     [
 
 MEMO: mime-types ( -- assoc )
     [

-        mime-db [ unclip '[ [ , ] dip set ] each ] each
+        mime-db [ unclip '[ [ _ ] dip set ] each ] each

     ] H{ } make-assoc
     nonstandard-mime-types assoc-union ;
 
     ] H{ } make-assoc
     nonstandard-mime-types assoc-union ;
 

diff --git a/basis/multiline/multiline.factor b/basis/multiline/multiline.factor
index 856b9ad4562c39f687214f1167878ec205862e3c..5969fc0a95dc0a9349bdac8be37a3bdc87074bbd 100755 (executable)
--- a/basis/multiline/multiline.factor
+++ b/basis/multiline/multiline.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.

-USING: namespaces parser lexer kernel sequences words quotations math
-accessors ;
+USING: namespaces make parser lexer kernel sequences words
+quotations math accessors ;

 IN: multiline
 
 <PRIVATE
 IN: multiline
 
 <PRIVATE

diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor
index 7083262c496f1e91bd9626c136459a63cac13eee..776450ccd98443db593f7028236df5af3082b9b2 100644 (file)
--- a/basis/peg/ebnf/ebnf.factor
+++ b/basis/peg/ebnf/ebnf.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2007 Chris Double.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 ! Copyright (C) 2007 Chris Double.\r
 ! See http://factorcode.org/license.txt for BSD license.\r

-USING: kernel compiler.units words arrays strings math.parser sequences \r
-       quotations vectors namespaces math assocs continuations peg\r
-       peg.parsers unicode.categories multiline \r
-       splitting accessors effects sequences.deep peg.search\r
-       combinators.short-circuit lexer io.streams.string\r
-       stack-checker io prettyprint combinators parser ;\r
+USING: kernel compiler.units words arrays strings math.parser\r
+sequences quotations vectors namespaces make math assocs\r
+continuations peg peg.parsers unicode.categories multiline\r
+splitting accessors effects sequences.deep peg.search\r
+combinators.short-circuit lexer io.streams.string stack-checker\r
+io prettyprint combinators parser ;\r

 IN: peg.ebnf\r
 \r
 : rule ( name word -- parser )\r
 IN: peg.ebnf\r
 \r
 : rule ( name word -- parser )\r

diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor
index e90a4c60b67c21331fa91b4e283efeb95a962c56..cc13d5d42510fbfa3fcb788dea3187e0f00cef31 100755 (executable)
--- a/basis/peg/peg.factor
+++ b/basis/peg/peg.factor
@@ -356,7 +356,7 @@ TUPLE: token-parser symbol ;
   ] if ;
 
 M: token-parser (compile) ( peg -- quot )
   ] if ;
 
 M: token-parser (compile) ( peg -- quot )

-  symbol>> '[ input-slice , parse-token ] ;
+  symbol>> '[ input-slice _ parse-token ] ;

    
 TUPLE: satisfy-parser quot ;
 
    
 TUPLE: satisfy-parser quot ;
 


@@ -373,7 +373,7 @@ TUPLE: satisfy-parser quot ;
 
 
 M: satisfy-parser (compile) ( peg -- quot )
 
 
 M: satisfy-parser (compile) ( peg -- quot )

-  quot>> '[ input-slice , parse-satisfy ] ;
+  quot>> '[ input-slice _ parse-satisfy ] ;

 
 TUPLE: range-parser min max ;
 
 
 TUPLE: range-parser min max ;
 


@@ -389,7 +389,7 @@ TUPLE: range-parser min max ;
   ] if ;
 
 M: range-parser (compile) ( peg -- quot )
   ] if ;
 
 M: range-parser (compile) ( peg -- quot )

-  [ min>> ] [ max>> ] bi '[ input-slice , , parse-range ] ;
+  [ min>> ] [ max>> ] bi '[ input-slice _ _ parse-range ] ;

 
 TUPLE: seq-parser parsers ;
 
 
 TUPLE: seq-parser parsers ;
 


@@ -447,7 +447,7 @@ TUPLE: repeat0-parser p1 ;
 
 M: repeat0-parser (compile) ( peg -- quot )
   p1>> compile-parser 1quotation '[ 
 
 M: repeat0-parser (compile) ( peg -- quot )
   p1>> compile-parser 1quotation '[ 

-    input-slice V{ } clone <parse-result> , swap (repeat) 
+    input-slice V{ } clone <parse-result> _ swap (repeat) 

   ] ; 
 
 TUPLE: repeat1-parser p1 ;
   ] ; 
 
 TUPLE: repeat1-parser p1 ;


@@ -461,7 +461,7 @@ TUPLE: repeat1-parser p1 ;
 
 M: repeat1-parser (compile) ( peg -- quot )
   p1>> compile-parser 1quotation '[ 
 
 M: repeat1-parser (compile) ( peg -- quot )
   p1>> compile-parser 1quotation '[ 

-    input-slice V{ } clone <parse-result> , swap (repeat) repeat1-empty-check  
+    input-slice V{ } clone <parse-result> _ swap (repeat) repeat1-empty-check  

   ] ; 
 
 TUPLE: optional-parser p1 ;
   ] ; 
 
 TUPLE: optional-parser p1 ;


@@ -483,7 +483,7 @@ TUPLE: semantic-parser p1 quot ;
 
 M: semantic-parser (compile) ( peg -- quot )
   [ p1>> compile-parser 1quotation ] [ quot>> ] bi  
 
 M: semantic-parser (compile) ( peg -- quot )
   [ p1>> compile-parser 1quotation ] [ quot>> ] bi  

-  '[ @ , check-semantic ] ;
+  '[ @ _ check-semantic ] ;

 
 TUPLE: ensure-parser p1 ;
 
 
 TUPLE: ensure-parser p1 ;
 


@@ -511,7 +511,7 @@ TUPLE: action-parser p1 quot ;
   ] if ; inline
 
 M: action-parser (compile) ( peg -- quot )
   ] if ; inline
 
 M: action-parser (compile) ( peg -- quot )

-  [ p1>> compile-parser 1quotation ] [ quot>> ] bi '[ @ , check-action ] ;
+  [ p1>> compile-parser 1quotation ] [ quot>> ] bi '[ @ _ check-action ] ;

 
 TUPLE: sp-parser p1 ;
 
 
 TUPLE: sp-parser p1 ;
 

diff --git a/basis/persistent/hashtables/hashtables-tests.factor b/basis/persistent/hashtables/hashtables-tests.factor
index ac6aa240ccd44faa85e25b19ceeac4900fa674fb..5ed72e5d599904f61a92983ef5aa6ca181510635 100644 (file)
--- a/basis/persistent/hashtables/hashtables-tests.factor
+++ b/basis/persistent/hashtables/hashtables-tests.factor
@@ -85,7 +85,7 @@ M: hash-0-b hashcode* 2drop 0 ;
 
 : random-assocs ( -- hash phash )
     [ random-string ] replicate
 
 : random-assocs ( -- hash phash )
     [ random-string ] replicate

-    [ H{ } clone [ '[ swap , set-at ] each-index ] keep ]
+    [ H{ } clone [ '[ swap _ set-at ] each-index ] keep ]

     [ PH{ } clone swap [ spin new-at ] each-index ]
     bi ;
 
     [ PH{ } clone swap [ spin new-at ] each-index ]
     bi ;
 

diff --git a/basis/persistent/hashtables/hashtables.factor b/basis/persistent/hashtables/hashtables.factor
index 2e2be264bbacc6a642abe767f1bc7d442893ad1b..a867dbb2e31859e059f01b1e92f5ebc6fa5684bb 100644 (file)
--- a/basis/persistent/hashtables/hashtables.factor
+++ b/basis/persistent/hashtables/hashtables.factor
@@ -1,7 +1,7 @@
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
 USING: kernel math accessors assocs fry combinators parser
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
 USING: kernel math accessors assocs fry combinators parser

-prettyprint.backend namespaces
+prettyprint.backend make

 persistent.assocs
 persistent.hashtables.nodes
 persistent.hashtables.nodes.empty
 persistent.assocs
 persistent.hashtables.nodes
 persistent.hashtables.nodes.empty

diff --git a/basis/persistent/hashtables/nodes/collision/collision.factor b/basis/persistent/hashtables/nodes/collision/collision.factor
index 741e3d067a94d048455a9a979351884ef4ef8c2f..2ee4008f2b437ce7e159f474a8ae7cd4bacaade4 100644 (file)
--- a/basis/persistent/hashtables/nodes/collision/collision.factor
+++ b/basis/persistent/hashtables/nodes/collision/collision.factor
@@ -8,7 +8,7 @@ persistent.hashtables.nodes.leaf ;
 IN: persistent.hashtables.nodes.collision
 
 : find-index ( key hashcode collision-node -- n leaf-node )
 IN: persistent.hashtables.nodes.collision
 
 : find-index ( key hashcode collision-node -- n leaf-node )

-    leaves>> -rot '[ [ , , ] dip matching-key? ] find ; inline
+    leaves>> -rot '[ [ _ _ ] dip matching-key? ] find ; inline

 
 M:: collision-node (entry-at) ( key hashcode collision-node -- leaf-node )
     key hashcode collision-node find-index nip ;
 
 M:: collision-node (entry-at) ( key hashcode collision-node -- leaf-node )
     key hashcode collision-node find-index nip ;

diff --git a/basis/persistent/hashtables/nodes/leaf/leaf.factor b/basis/persistent/hashtables/nodes/leaf/leaf.factor
index 7fa4cfe40162ff037da8ab5be835389b7c2c1e8c..3419e8387fc9bb748063b183a81f05fc4230ed21 100644 (file)
--- a/basis/persistent/hashtables/nodes/leaf/leaf.factor
+++ b/basis/persistent/hashtables/nodes/leaf/leaf.factor
@@ -1,6 +1,6 @@
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 

-USING: kernel accessors locals math arrays namespaces
+USING: kernel accessors locals math arrays namespaces make

 persistent.hashtables.config
 persistent.hashtables.nodes ;
 IN: persistent.hashtables.nodes.leaf
 persistent.hashtables.config
 persistent.hashtables.nodes ;
 IN: persistent.hashtables.nodes.leaf

diff --git a/basis/smtp/smtp.factor b/basis/smtp/smtp.factor
index fa98c7a9476231233dc69f6e5a5b200199f42233..f95ecddc1e6ad729bc67ee093693ee051c13d3a9 100755 (executable)
--- a/basis/smtp/smtp.factor
+++ b/basis/smtp/smtp.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Elie CHAFTARI, Dirk Vleugels,
 ! Slava Pestov, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007, 2008 Elie CHAFTARI, Dirk Vleugels,
 ! Slava Pestov, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays namespaces io io.timeouts kernel logging
+USING: arrays namespaces make io io.timeouts kernel logging

 io.sockets sequences combinators splitting assocs strings
 math.parser random system calendar io.encodings.ascii summary
 calendar.format accessors sets hashtables ;
 io.sockets sequences combinators splitting assocs strings
 math.parser random system calendar io.encodings.ascii summary
 calendar.format accessors sets hashtables ;

diff --git a/basis/stack-checker/backend/backend.factor b/basis/stack-checker/backend/backend.factor
index f4cd2c4a8e3892fe611c02a84d90109faf2b55db..aa280b96b6ca516463db730465ce8463db49a502 100755 (executable)
--- a/basis/stack-checker/backend/backend.factor
+++ b/basis/stack-checker/backend/backend.factor
@@ -70,7 +70,7 @@ M: object apply-object push-literal ;
     2array recursive-state get swap prefix infer-quot ;
 
 : time-bomb ( error -- )
     2array recursive-state get swap prefix infer-quot ;
 
 : time-bomb ( error -- )

-    '[ , throw ] recursive-state get infer-quot ;
+    '[ _ throw ] recursive-state get infer-quot ;

 
 : bad-call ( -- )
     "call must be given a callable" time-bomb ;
 
 : bad-call ( -- )
     "call must be given a callable" time-bomb ;


@@ -165,7 +165,7 @@ M: object apply-object push-literal ;
     ] maybe-cannot-infer ;
 
 : apply-word/effect ( word effect -- )
     ] maybe-cannot-infer ;
 
 : apply-word/effect ( word effect -- )

-    swap '[ , #call, ] consume/produce ;
+    swap '[ _ #call, ] consume/produce ;

 
 : required-stack-effect ( word -- effect )
     dup stack-effect [ ] [ \ missing-effect inference-error ] ?if ;
 
 : required-stack-effect ( word -- effect )
     dup stack-effect [ ] [ \ missing-effect inference-error ] ?if ;

diff --git a/basis/stack-checker/branches/branches.factor b/basis/stack-checker/branches/branches.factor
index 651b8d162695d335a86707f3335c8bd125a4a52f..511dcc6bbd2b3b95694911990e81cde8ed736e45 100644 (file)
--- a/basis/stack-checker/branches/branches.factor
+++ b/basis/stack-checker/branches/branches.factor
@@ -17,12 +17,12 @@ SYMBOL: +bottom+
 : pad-with-bottom ( seq -- newseq )
     dup empty? [
         dup [ length ] map supremum
 : pad-with-bottom ( seq -- newseq )
     dup empty? [
         dup [ length ] map supremum

-        '[ , +bottom+ pad-left ] map
+        '[ _ +bottom+ pad-left ] map

     ] unless ;
 
 : phi-inputs ( max-d-in pairs -- newseq )
     dup empty? [ nip ] [
     ] unless ;
 
 : phi-inputs ( max-d-in pairs -- newseq )
     dup empty? [ nip ] [

-        swap '[ [ , ] dip first2 unify-inputs ] map
+        swap '[ [ _ ] dip first2 unify-inputs ] map

         pad-with-bottom
     ] if ;
 
         pad-with-bottom
     ] if ;
 


@@ -50,7 +50,7 @@ SYMBOL: quotations
     ] if-empty ;
 
 : branch-variable ( seq symbol -- seq )
     ] if-empty ;
 
 : branch-variable ( seq symbol -- seq )

-    '[ [ , ] dip at ] map ;
+    '[ [ _ ] dip at ] map ;

 
 : active-variable ( seq symbol -- seq )
     [ [ terminated? over at [ drop f ] when ] map ] dip
 
 : active-variable ( seq symbol -- seq )
     [ [ terminated? over at [ drop f ] when ] map ] dip

diff --git a/basis/stack-checker/inlining/inlining.factor b/basis/stack-checker/inlining/inlining.factor
index 07ff016b2da62e5b9e71b4716aa3d787a4ef7fb9..7847fdfdcf194d4db13e226e53c205dcd814d917 100644 (file)
--- a/basis/stack-checker/inlining/inlining.factor
+++ b/basis/stack-checker/inlining/inlining.factor
@@ -130,13 +130,13 @@ SYMBOL: enter-out
 : adjust-stack-effect ( effect -- effect' )
     [ in>> ] [ out>> ] bi
     meta-d get length pick length [-]
 : adjust-stack-effect ( effect -- effect' )
     [ in>> ] [ out>> ] bi
     meta-d get length pick length [-]

-    object <repetition> '[ , prepend ] bi@
+    object <repetition> '[ _ prepend ] bi@

     <effect> ;
 
 : call-recursive-inline-word ( word -- )
     dup "recursive" word-prop [
         [ required-stack-effect adjust-stack-effect ] [ ] [ recursive-label ] tri
     <effect> ;
 
 : call-recursive-inline-word ( word -- )
     dup "recursive" word-prop [
         [ required-stack-effect adjust-stack-effect ] [ ] [ recursive-label ] tri

-        [ 2nip check-call ] [ nip '[ , #call-recursive, ] consume/produce ] 3bi
+        [ 2nip check-call ] [ nip '[ _ #call-recursive, ] consume/produce ] 3bi

     ] [ undeclared-recursion-error inference-error ] if ;
 
 : inline-word ( word -- )
     ] [ undeclared-recursion-error inference-error ] if ;
 
 : inline-word ( word -- )

diff --git a/basis/stack-checker/state/state.factor b/basis/stack-checker/state/state.factor
index 0d0de7f19b1faed6bc497d4c21035c2494dd3492..d3d32b50147d73eccd56d75d4c2e90571a338809 100755 (executable)
--- a/basis/stack-checker/state/state.factor
+++ b/basis/stack-checker/state/state.factor
@@ -91,7 +91,7 @@ SYMBOL: dependencies
 : depends-on ( word how -- )
     over primitive? [ 2drop ] [
         dependencies get dup [
 : depends-on ( word how -- )
     over primitive? [ 2drop ] [
         dependencies get dup [

-            swap '[ , strongest-dependency ] change-at
+            swap '[ _ strongest-dependency ] change-at

         ] [ 3drop ] if
     ] if ;
 
         ] [ 3drop ] if
     ] if ;
 


@@ -100,7 +100,7 @@ SYMBOL: generic-dependencies
 
 : depends-on-generic ( generic class -- )
     generic-dependencies get dup
 
 : depends-on-generic ( generic class -- )
     generic-dependencies get dup

-    [ swap '[ null or , class-or ] change-at ] [ 3drop ] if ;
+    [ swap '[ null or _ class-or ] change-at ] [ 3drop ] if ;

 
 ! Words we've inferred the stack effect of, for rollback
 SYMBOL: recorded
 
 ! Words we've inferred the stack effect of, for rollback
 SYMBOL: recorded

diff --git a/basis/stack-checker/transforms/transforms.factor b/basis/stack-checker/transforms/transforms.factor
index e64795c5dfb5ff0b1ef29d6013b8e2d983496cdf..41c7e2c9729f74655eb9ebe0c074bd371e121252 100755 (executable)
--- a/basis/stack-checker/transforms/transforms.factor
+++ b/basis/stack-checker/transforms/transforms.factor
@@ -19,7 +19,7 @@ IN: stack-checker.transforms
     dup [
         [
             [ drop ] [
     dup [
         [
             [ drop ] [

-                [ length meta-d get '[ , pop* ] times ]
+                [ length meta-d get '[ _ pop* ] times ]

                 [ #drop, ]
                 bi
             ] bi*
                 [ #drop, ]
                 bi
             ] bi*


@@ -97,7 +97,7 @@ IN: stack-checker.transforms
     dup tuple-class? [
         dup inlined-dependency depends-on
         [ "boa-check" word-prop ]
     dup tuple-class? [
         dup inlined-dependency depends-on
         [ "boa-check" word-prop ]

-        [ tuple-layout '[ , <tuple-boa> ] ]
+        [ tuple-layout '[ _ <tuple-boa> ] ]

         bi append
     ] [ drop f ] if
 ] 1 define-transform
         bi append
     ] [ drop f ] if
 ] 1 define-transform

diff --git a/basis/state-parser/state-parser.factor b/basis/state-parser/state-parser.factor
index 15c83bf73afd2fea16abf25ddd573f56c88826be..dab5414b49ec18d0b7e80ce7b72b7d0696913a13 100644 (file)
--- a/basis/state-parser/state-parser.factor
+++ b/basis/state-parser/state-parser.factor
@@ -100,7 +100,7 @@ SYMBOL: prolog-data
     #! from code until the quotation given is true and\r
     #! advance spot to after the substring.\r
     10 <sbuf> [\r
     #! from code until the quotation given is true and\r
     #! advance spot to after the substring.\r
     10 <sbuf> [\r

-        '[ @ [ t ] [ get-char , push f ] if ] skip-until\r
+        '[ @ [ t ] [ get-char _ push f ] if ] skip-until\r

     ] keep >string ; inline\r
 \r
 : take-rest ( -- string )\r
     ] keep >string ; inline\r
 \r
 : take-rest ( -- string )\r


@@ -120,7 +120,7 @@ M: not-enough-characters summary ( obj -- str )
 \r
 : take ( n -- string )\r
     [ 1- ] [ <sbuf> ] bi [\r
 \r
 : take ( n -- string )\r
     [ 1- ] [ <sbuf> ] bi [\r

-        '[ drop get-char [ next , push f ] [ t ] if* ] contains? drop\r
+        '[ drop get-char [ next _ push f ] [ t ] if* ] contains? drop\r

     ] keep get-char [ over push ] when* >string ;\r
 \r
 : pass-blank ( -- )\r
     ] keep get-char [ over push ] when* >string ;\r
 \r
 : pass-blank ( -- )\r

diff --git a/basis/syndication/syndication.factor b/basis/syndication/syndication.factor
index 2fa8abcd59e1599410ff15ff8ed151de6374f34f..a432d8c31c92a4cb9d1dbea726ca0cd771c73beb 100644 (file)
--- a/basis/syndication/syndication.factor
+++ b/basis/syndication/syndication.factor
@@ -4,7 +4,7 @@
 USING: xml.utilities kernel assocs xml.generator math.order
     strings sequences xml.data xml.writer
     io.streams.string combinators xml xml.entities io.files io
 USING: xml.utilities kernel assocs xml.generator math.order
     strings sequences xml.data xml.writer
     io.streams.string combinators xml xml.entities io.files io

-    http.client namespaces xml.generator hashtables
+    http.client namespaces make xml.generator hashtables

     calendar.format accessors continuations urls present ;
 IN: syndication
 
     calendar.format accessors continuations urls present ;
 IN: syndication
 

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 7e37436654627489ec951634b0d129ac3f9510f8..f2726c00fa21ad104fa5e81a686ace8d1988dbb4 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors qualified io.streams.c init fry namespaces
+USING: accessors qualified io.streams.c init fry namespaces make

 assocs kernel parser lexer strings.parser tools.deploy.config
 vocabs sequences words words.private memory kernel.private
 continuations io prettyprint vocabs.loader debugger system
 assocs kernel parser lexer strings.parser tools.deploy.config
 vocabs sequences words words.private memory kernel.private
 continuations io prettyprint vocabs.loader debugger system


@@ -76,7 +76,7 @@ IN: tools.deploy.shaker
     [
         [
             props>> swap
     [
         [
             props>> swap

-            '[ drop , member? not ] assoc-filter sift-assoc
+            '[ drop _ member? not ] assoc-filter sift-assoc

             dup assoc-empty? [ drop f ] [ >alist >vector ] if
         ] keep (>>props)
     ] with each ;
             dup assoc-empty? [ drop f ] [ >alist >vector ] if
         ] keep (>>props)
     ] with each ;


@@ -283,7 +283,7 @@ IN: tools.deploy.shaker
     strip-globals? [
         "Stripping globals" show
         global swap
     strip-globals? [
         "Stripping globals" show
         global swap

-        '[ drop , member? not ] assoc-filter
+        '[ drop _ member? not ] assoc-filter

         [ drop string? not ] assoc-filter ! strip CLI args
         sift-assoc
         dup keys unparse show
         [ drop string? not ] assoc-filter ! strip CLI args
         sift-assoc
         dup keys unparse show

diff --git a/basis/tr/tr.factor b/basis/tr/tr.factor
index b5ad2ba430ac5acfba2994f1c4b94599ddd5908c..30d0efb28ba0c06e8140222649f6ba839bc772be 100644 (file)
--- a/basis/tr/tr.factor
+++ b/basis/tr/tr.factor
@@ -7,7 +7,7 @@ IN: tr
 <PRIVATE
 
 : compute-tr ( quot from to -- mapping )
 <PRIVATE
 
 : compute-tr ( quot from to -- mapping )

-    zip [ 256 ] 2dip '[ [ @ , at ] keep or ] B{ } map-as ; inline
+    zip [ 256 ] 2dip '[ [ @ _ at ] keep or ] B{ } map-as ; inline

 
 : tr-hints ( word -- )
     { { byte-array } { string } } "specializer" set-word-prop ;
 
 : tr-hints ( word -- )
     { { byte-array } { string } } "specializer" set-word-prop ;


@@ -16,13 +16,13 @@ IN: tr
     create-in dup tr-hints ;
 
 : tr-quot ( mapping -- quot )
     create-in dup tr-hints ;
 
 : tr-quot ( mapping -- quot )

-    '[ [ dup 0 255 between? [ , nth-unsafe ] when ] map ] ;
+    '[ [ dup 0 255 between? [ _ nth-unsafe ] when ] map ] ;

 
 : define-tr ( word mapping -- )
     tr-quot (( seq -- translated )) define-declared ;
 
 : fast-tr-quot ( mapping -- quot )
 
 : define-tr ( word mapping -- )
     tr-quot (( seq -- translated )) define-declared ;
 
 : fast-tr-quot ( mapping -- quot )

-    '[ [ , nth-unsafe ] change-each ] ;
+    '[ [ _ nth-unsafe ] change-each ] ;

 
 : define-fast-tr ( word mapping -- )
     fast-tr-quot (( seq -- )) define-declared ;
 
 : define-fast-tr ( word mapping -- )
     fast-tr-quot (( seq -- )) define-declared ;

diff --git a/basis/ui/gadgets/tracks/tracks.factor b/basis/ui/gadgets/tracks/tracks.factor
index cf679424e09370f09e094c0af96703a1c81da3aa..029bc5447cc0b712bdba49a0a400396b34793949 100644 (file)
--- a/basis/ui/gadgets/tracks/tracks.factor
+++ b/basis/ui/gadgets/tracks/tracks.factor
@@ -9,7 +9,7 @@ IN: ui.gadgets.tracks
 TUPLE: track < pack sizes ;
 
 : normalized-sizes ( track -- seq )
 TUPLE: track < pack sizes ;
 
 : normalized-sizes ( track -- seq )

-  sizes>> dup sift sum '[ dup [ , / ] when ] map ;
+  sizes>> dup sift sum '[ dup [ _ / ] when ] map ;

 
 : init-track ( track -- track )
   init-gadget
 
 : init-track ( track -- track )
   init-gadget

diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor
index e4018e4d20a2c48d855d4e6bccfed632d729d89c..88381ca7d704ad6fd0fb32bb13f0cd58f57e9552 100755 (executable)
--- a/basis/unicode/breaks/breaks.factor
+++ b/basis/unicode/breaks/breaks.factor
@@ -1,7 +1,8 @@
-USING: combinators.short-circuit unicode.categories kernel math combinators splitting
-sequences math.parser io.files io assocs arrays namespaces
-math.ranges unicode.normalize values io.encodings.ascii
-unicode.syntax unicode.data compiler.units alien.syntax sets ;
+USING: combinators.short-circuit unicode.categories kernel math
+combinators splitting sequences math.parser io.files io assocs
+arrays namespaces make math.ranges unicode.normalize values
+io.encodings.ascii unicode.syntax unicode.data compiler.units
+alien.syntax sets ;

 IN: unicode.breaks
 
 C-ENUM: Any L V T Extend Control CR LF graphemes ;
 IN: unicode.breaks
 
 C-ENUM: Any L V T Extend Control CR LF graphemes ;

diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor
index d71fffaaabea8f1675a1c1a551e35e401fad3cc0..3ebb474a8195d681bcfc2590ad2b38119f3d3066 100755 (executable)
--- a/basis/unicode/collation/collation.factor
+++ b/basis/unicode/collation/collation.factor
@@ -1,6 +1,6 @@
 USING: combinators.short-circuit sequences io.files\r
 io.encodings.ascii kernel values splitting accessors math.parser\r
 USING: combinators.short-circuit sequences io.files\r
 io.encodings.ascii kernel values splitting accessors math.parser\r

-ascii io assocs strings math namespaces sorting combinators\r
+ascii io assocs strings math namespaces make sorting combinators\r

 math.order arrays unicode.normalize unicode.data locals\r
 unicode.syntax macros sequences.deep words unicode.breaks\r
 quotations ;\r
 math.order arrays unicode.normalize unicode.data locals\r
 unicode.syntax macros sequences.deep words unicode.breaks\r
 quotations ;\r

diff --git a/basis/unicode/script/script.factor b/basis/unicode/script/script.factor
index 40b0751e2c7cebe778e2aa51ae21004671267e3f..aa9ca843bd17a9853c83b780b8bb1edabe0e3c5a 100755 (executable)
--- a/basis/unicode/script/script.factor
+++ b/basis/unicode/script/script.factor
@@ -1,6 +1,6 @@
 USING: accessors values kernel sequences assocs io.files
 io.encodings ascii math.ranges io splitting math.parser 
 USING: accessors values kernel sequences assocs io.files
 io.encodings ascii math.ranges io splitting math.parser 

-namespaces byte-arrays locals math sets io.encodings.ascii
+namespaces make byte-arrays locals math sets io.encodings.ascii

 words compiler.units arrays interval-maps unicode.data ;
 IN: unicode.script
 
 words compiler.units arrays interval-maps unicode.data ;
 IN: unicode.script
 

diff --git a/basis/urls/urls.factor b/basis/urls/urls.factor
index 92a05806b57f2acad6f33a8b9abaddb19d822662..e16f62d1f1e53ad30df6ba746415a8a9b854946b 100644 (file)
--- a/basis/urls/urls.factor
+++ b/basis/urls/urls.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel ascii combinators combinators.short-circuit
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel ascii combinators combinators.short-circuit

-sequences splitting fry namespaces assocs arrays strings
+sequences splitting fry namespaces make assocs arrays strings

 io.sockets io.sockets.secure io.encodings.string
 io.encodings.utf8 math math.parser accessors parser
 strings.parser lexer prettyprint.backend hashtables present ;
 io.sockets io.sockets.secure io.encodings.string
 io.encodings.utf8 math math.parser accessors parser
 strings.parser lexer prettyprint.backend hashtables present ;


@@ -105,7 +105,7 @@ TUPLE: url protocol username password host port path query anchor ;
     swap query>> at ;
 
 : set-query-param ( url value key -- url )
     swap query>> at ;
 
 : set-query-param ( url value key -- url )

-    '[ [ , , ] dip ?set-at ] change-query ;
+    '[ [ _ _ ] dip ?set-at ] change-query ;

 
 : parse-host ( string -- host port )
     ":" split1 [ url-decode ] [
 
 : parse-host ( string -- host port )
     ":" split1 [ url-decode ] [


@@ -220,7 +220,7 @@ PRIVATE>
     } case ;
 
 : ensure-port ( url -- url' )
     } case ;
 
 : ensure-port ( url -- url' )

-    dup protocol>> '[ , protocol-port or ] change-port ;
+    dup protocol>> '[ _ protocol-port or ] change-port ;

 
 ! Literal syntax
 : URL" lexer get skip-blank parse-string >url parsed ; parsing
 
 ! Literal syntax
 : URL" lexer get skip-blank parse-string >url parsed ; parsing

diff --git a/basis/validators/validators.factor b/basis/validators/validators.factor
index b786ef55290433a3b5f60068358cf773b5085d67..f24171b2b476551f5344f5cd090119025b4b5da0 100644 (file)
--- a/basis/validators/validators.factor
+++ b/basis/validators/validators.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2006, 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2006, 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel continuations sequences math
-namespaces sets math.parser math.ranges assocs regexp
-unicode.categories arrays hashtables words
-classes quotations xmode.catalog ;
+USING: kernel continuations sequences math namespaces make sets
+math.parser math.ranges assocs regexp unicode.categories arrays
+hashtables words classes quotations xmode.catalog ;

 IN: validators
 
 : v-default ( str def -- str )
 IN: validators
 
 : v-default ( str def -- str )

diff --git a/basis/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor
index 2f766a3a517a20a5b0d2cef3e18105373d172ba6..c56293babe828b39d72efaa732858e9a9690070d 100755 (executable)
--- a/basis/windows/com/syntax/syntax.factor
+++ b/basis/windows/com/syntax/syntax.factor
@@ -12,7 +12,7 @@ C-STRUCT: com-interface
 MACRO: com-invoke ( n return parameters -- )
     dup length -roll
     '[
 MACRO: com-invoke ( n return parameters -- )
     dup length -roll
     '[

-        , npick com-interface-vtbl , swap void*-nth , ,
+        _ npick com-interface-vtbl _ swap void*-nth _ _

         "stdcall" alien-indirect
     ] ;
 
         "stdcall" alien-indirect
     ] ;
 

diff --git a/basis/windows/com/wrapper/wrapper.factor b/basis/windows/com/wrapper/wrapper.factor
index 59b616ecc7152f6cbb19ac3ab00d7dd7d7afbbd5..d376cccae2e6eede05f82ac7a710bd5b19cf535a 100755 (executable)
--- a/basis/windows/com/wrapper/wrapper.factor
+++ b/basis/windows/com/wrapper/wrapper.factor
@@ -48,7 +48,7 @@ unless
     (query-interface-cases) 
     '[
         swap 16 memory>byte-array
     (query-interface-cases) 
     '[
         swap 16 memory>byte-array

-        , case
+        _ case

         [
             "void*" heap-size * rot <displaced-alien> com-add-ref
             0 rot set-void*-nth S_OK
         [
             "void*" heap-size * rot <displaced-alien> com-add-ref
             0 rot set-void*-nth S_OK


@@ -57,14 +57,14 @@ unless
 
 : (make-add-ref) ( interfaces -- quot )
     length "void*" heap-size * '[
 
 : (make-add-ref) ( interfaces -- quot )
     length "void*" heap-size * '[

-        , swap <displaced-alien>
+        _ swap <displaced-alien>

         0 over ulong-nth
         1+ [ 0 rot set-ulong-nth ] keep
     ] ;
 
 : (make-release) ( interfaces -- quot )
     length "void*" heap-size * '[
         0 over ulong-nth
         1+ [ 0 rot set-ulong-nth ] keep
     ] ;
 
 : (make-release) ( interfaces -- quot )
     length "void*" heap-size * '[

-        , over <displaced-alien>
+        _ over <displaced-alien>

         0 over ulong-nth
         1- [ 0 rot set-ulong-nth ] keep
         dup zero? [ swap (free-wrapped-object) ] [ nip ] if
         0 over ulong-nth
         1- [ 0 rot set-ulong-nth ] keep
         dup zero? [ swap (free-wrapped-object) ] [ nip ] if


@@ -79,16 +79,16 @@ unless
 : (thunk) ( n -- quot )
     dup 0 =
     [ drop [ ] ]
 : (thunk) ( n -- quot )
     dup 0 =
     [ drop [ ] ]

-    [ "void*" heap-size neg * '[ , swap <displaced-alien> ] ]
+    [ "void*" heap-size neg * '[ _ swap <displaced-alien> ] ]

     if ;
 
 : (thunked-quots) ( quots iunknown-methods thunk -- {thunk,quot}s )
     if ;
 
 : (thunked-quots) ( quots iunknown-methods thunk -- {thunk,quot}s )

-    [ '[ , '[ @ com-unwrap ] [ swap 2array ] curry map ] ]
-    [ '[ ,                   [ swap 2array ] curry map ] ] bi bi*
+    [ '[ _ '[ @ com-unwrap ] [ swap 2array ] curry map ] ]
+    [ '[ _                   [ swap 2array ] curry map ] ] bi bi*

     swap append ;
 
 : compile-alien-callback ( word return parameters abi quot -- word )
     swap append ;
 
 : compile-alien-callback ( word return parameters abi quot -- word )

-    '[ , , , , alien-callback ]
+    '[ _ _ _ _ alien-callback ]

     [ [ (( -- alien )) define-declared ] pick slip ]
     with-compilation-unit ;
 
     [ [ (( -- alien )) define-declared ] pick slip ]
     with-compilation-unit ;
 


@@ -100,7 +100,7 @@ unless
     "windows.com.wrapper.callbacks" create ;
 
 : (finish-thunk) ( param-count thunk quot -- thunked-quot )
     "windows.com.wrapper.callbacks" create ;
 
 : (finish-thunk) ( param-count thunk quot -- thunked-quot )

-    [ [ drop [ ] ] [ swap 1- '[ , , ndip ] ] if-empty ]
+    [ [ drop [ ] ] [ swap 1- '[ _ _ ndip ] ] if-empty ]

     dip compose ;
 
 : (make-interface-callbacks) ( interface-name quots iunknown-methods n -- words )
     dip compose ;
 
 : (make-interface-callbacks) ( interface-name quots iunknown-methods n -- words )


@@ -108,7 +108,7 @@ unless
     swap [ find-com-interface-definition family-tree-functions ]
     keep (next-vtbl-counter) '[
         swap [
     swap [ find-com-interface-definition family-tree-functions ]
     keep (next-vtbl-counter) '[
         swap [

-            [ name>> , , (callback-word) ]
+            [ name>> _ _ (callback-word) ]

             [ return>> ] [
                 parameters>>
                 [ [ first ] map ]
             [ return>> ] [
                 parameters>>
                 [ [ first ] map ]

diff --git a/basis/windows/dinput/constants/constants.factor b/basis/windows/dinput/constants/constants.factor
index 6c55ff0e67cbfbb7f89e61fbcc8334d77853ca2f..182c17430ff8cbbe50873814f8ca6dd1ccfd8476 100755 (executable)
--- a/basis/windows/dinput/constants/constants.factor
+++ b/basis/windows/dinput/constants/constants.factor
@@ -78,7 +78,7 @@ SYMBOLS:
 
 : (malloc-guid-symbol) ( symbol guid -- )
     global swap '[ [
 
 : (malloc-guid-symbol) ( symbol guid -- )
     global swap '[ [

-        , execute [ byte-length malloc ] [ over byte-array>memory ] bi
+        _ execute [ byte-length malloc ] [ over byte-array>memory ] bi

     ] unless* ] change-at ;
 
 : define-guid-constants ( -- )
     ] unless* ] change-at ;
 
 : define-guid-constants ( -- )

diff --git a/basis/wrap/wrap.factor b/basis/wrap/wrap.factor
index 29a8bbf10fa881c3e004d9b329006006cf48eaf6..87a870d75d771421e6abdf58bfdf1dbf2eb2809c 100644 (file)
--- a/basis/wrap/wrap.factor
+++ b/basis/wrap/wrap.factor
@@ -1,4 +1,4 @@
-USING: sequences kernel namespaces splitting math math.order ;
+USING: sequences kernel namespaces make splitting math math.order ;

 IN: wrap
 
 ! Very stupid word wrapping/line breaking
 IN: wrap
 
 ! Very stupid word wrapping/line breaking

diff --git a/basis/x11/glx/glx.factor b/basis/x11/glx/glx.factor
index a8608235f2066bb0925f1533b12ddbf8f22bc8f0..eefb93772a07235776a7e521bfdf44418768738d 100644 (file)
--- a/basis/x11/glx/glx.factor
+++ b/basis/x11/glx/glx.factor
@@ -3,7 +3,7 @@
 !
 ! based on glx.h from xfree86, and some of glxtokens.h
 USING: alien alien.c-types alien.syntax alien.syntax.private x11.xlib
 !
 ! based on glx.h from xfree86, and some of glxtokens.h
 USING: alien alien.c-types alien.syntax alien.syntax.private x11.xlib

-namespaces kernel sequences parser words ;
+namespaces make kernel sequences parser words ;

 IN: x11.glx
 
 LIBRARY: glx
 IN: x11.glx
 
 LIBRARY: glx

diff --git a/basis/xml/entities/entities.factor b/basis/xml/entities/entities.factor
index b90613ec7991d39bc95ec5b6acae1be085b0552e..d3eca306858d0420620c1d6d0939afb8930a8e37 100644 (file)
--- a/basis/xml/entities/entities.factor
+++ b/basis/xml/entities/entities.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.

-USING: namespaces kernel assocs sequences ;
+USING: namespaces make kernel assocs sequences ;

 IN: xml.entities
 
 : entities-out
 IN: xml.entities
 
 : entities-out

diff --git a/basis/xml/generator/generator.factor b/basis/xml/generator/generator.factor
index 0de1692e007bee7acf06e6ebfb1ebc759337fcbb..24da501265a309d3c97234e68688f516503cb0fc 100644 (file)
--- a/basis/xml/generator/generator.factor
+++ b/basis/xml/generator/generator.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2006, 2007 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2006, 2007 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.

-USING: namespaces kernel xml.data xml.utilities assocs sequences ;
+USING: namespaces make kernel xml.data xml.utilities assocs
+sequences ;

 IN: xml.generator
 
 : comment, ( string -- ) <comment> , ;
 IN: xml.generator
 
 : comment, ( string -- ) <comment> , ;

diff --git a/basis/xml/tokenize/tokenize.factor b/basis/xml/tokenize/tokenize.factor
index 0c3ef2c1df718ab7161e12c0b9ac9f7d67fba289..b7314c5b258f76d1037a87a1e559348f2d3ad193 100644 (file)
--- a/basis/xml/tokenize/tokenize.factor
+++ b/basis/xml/tokenize/tokenize.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: xml.errors xml.data xml.utilities xml.char-classes sets
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: xml.errors xml.data xml.utilities xml.char-classes sets

-xml.entities kernel state-parser kernel namespaces strings math
-math.parser sequences assocs arrays splitting combinators unicode.case
-accessors ;
+xml.entities kernel state-parser kernel namespaces make strings
+math math.parser sequences assocs arrays splitting combinators
+unicode.case accessors ;

 IN: xml.tokenize
 
 ! XML namespace processing: ns = namespace
 IN: xml.tokenize
 
 ! XML namespace processing: ns = namespace

diff --git a/basis/xmode/code2html/responder/responder.factor b/basis/xmode/code2html/responder/responder.factor
index 2bc766dbc6507b12503fec26e5bcfbfd26ff0a41..9115b1389bc323a69caeaf32b07894f7c2173ad7 100755 (executable)
--- a/basis/xmode/code2html/responder/responder.factor
+++ b/basis/xmode/code2html/responder/responder.factor
@@ -9,8 +9,8 @@ IN: xmode.code2html.responder
     [\r
         drop\r
         dup '[\r
     [\r
         drop\r
         dup '[\r

-            , utf8 [\r
-                , file-name input-stream get htmlize-stream\r
+            _ utf8 [\r
+                _ file-name input-stream get htmlize-stream\r

             ] with-file-reader\r
         ] "text/html" <content>\r
     ] <file-responder> ;\r
             ] with-file-reader\r
         ] "text/html" <content>\r
     ] <file-responder> ;\r

diff --git a/basis/xmode/loader/syntax/syntax.factor b/basis/xmode/loader/syntax/syntax.factor
index 5512b68b046d8cd037facfcea211f8f1d4ac30aa..69c4e4fac39bf87cbb2338aa96c8815d4ad6e3fe 100644 (file)
--- a/basis/xmode/loader/syntax/syntax.factor
+++ b/basis/xmode/loader/syntax/syntax.factor
@@ -1,6 +1,9 @@
-USING: accessors xmode.tokens xmode.rules xmode.keyword-map xml.data
-xml.utilities xml assocs kernel combinators sequences
-math.parser namespaces parser lexer xmode.utilities regexp io.files ;
+! Copyright (C) 2007, 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors xmode.tokens xmode.rules xmode.keyword-map
+xml.data xml.utilities xml assocs kernel combinators sequences
+math.parser namespaces make parser lexer xmode.utilities regexp
+io.files ;

 IN: xmode.loader.syntax
 
 SYMBOL: ignore-case?
 IN: xmode.loader.syntax
 
 SYMBOL: ignore-case?

diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor
index dfdd6c801a1f6404477dd56cac511a3d93c9a43d..d0d68febec5b964b579a43e074a3599347ce81db 100755 (executable)
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -1,5 +1,7 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.

 IN: xmode.marker
 IN: xmode.marker

-USING: kernel namespaces xmode.rules xmode.tokens
+USING: kernel namespaces make xmode.rules xmode.tokens

 xmode.marker.state xmode.marker.context xmode.utilities
 xmode.catalog sequences math assocs combinators
 strings regexp splitting parser-combinators ascii unicode.case
 xmode.marker.state xmode.marker.context xmode.utilities
 xmode.catalog sequences math assocs combinators
 strings regexp splitting parser-combinators ascii unicode.case

diff --git a/basis/xmode/marker/state/state.factor b/basis/xmode/marker/state/state.factor
index 9075ff63294c14110ba49ee15a046dd7715a9a40..096230ff4e3577bc604c6f14e6f4950cfdfd9e0c 100755 (executable)
--- a/basis/xmode/marker/state/state.factor
+++ b/basis/xmode/marker/state/state.factor
@@ -1,5 +1,7 @@
+! Copyright (C) 2007, 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.

 USING: xmode.marker.context xmode.rules symbols accessors
 USING: xmode.marker.context xmode.rules symbols accessors

-xmode.tokens namespaces kernel sequences assocs math ;
+xmode.tokens namespaces make kernel sequences assocs math ;

 IN: xmode.marker.state
 
 ! Based on org.gjt.sp.jedit.syntax.TokenMarker
 IN: xmode.marker.state
 
 ! Based on org.gjt.sp.jedit.syntax.TokenMarker

diff --git a/extra/asn1/asn1.factor b/extra/asn1/asn1.factor
index df5d11be751916873d3cbcfd635275828bb92fc0..bd1ed83baa6859e1b4b3e30e46b822adf1704823 100644 (file)
--- a/extra/asn1/asn1.factor
+++ b/extra/asn1/asn1.factor
@@ -3,7 +3,7 @@
 
 USING: arrays asn1.ldap assocs byte-arrays combinators
 continuations io io.binary io.streams.string kernel math
 
 USING: arrays asn1.ldap assocs byte-arrays combinators
 continuations io io.binary io.streams.string kernel math

-math.parser namespaces pack strings sequences accessors ;
+math.parser namespaces make pack strings sequences accessors ;

 
 IN: asn1
 
 
 IN: asn1
 

diff --git a/extra/backtrack/backtrack.factor b/extra/backtrack/backtrack.factor
index df397025f60f9399971fb1efcc1a60a8b5afce9e..9bef16d609c6871a73e779403835719d945a9cc2 100755 (executable)
--- a/extra/backtrack/backtrack.factor
+++ b/extra/backtrack/backtrack.factor
@@ -20,9 +20,9 @@ M: amb-failure summary drop "Backtracking failure" ;
     [ fail ] unless ;\r
 \r
 MACRO: checkpoint ( quot -- quot' )\r
     [ fail ] unless ;\r
 \r
 MACRO: checkpoint ( quot -- quot' )\r

-    '[ failure get ,\r
-       '[ '[ failure set , continue ] callcc0\r
-          , failure set @ ] callcc0 ] ;\r
+    '[ failure get _\r
+       '[ '[ failure set _ continue ] callcc0\r
+          _ failure set @ ] callcc0 ] ;\r

 \r
 : number-from ( from -- from+n )\r
     [ 1 + number-from ] checkpoint ;\r
 \r
 : number-from ( from -- from+n )\r
     [ 1 + number-from ] checkpoint ;\r


@@ -42,7 +42,7 @@ MACRO: unsafe-amb ( seq -- quot )
     dup length 1 =\r
     [ first 1quotation ]\r
     [ [ first ] [ rest ] bi\r
     dup length 1 =\r
     [ first 1quotation ]\r
     [ [ first ] [ rest ] bi\r

-      '[ , [ drop , unsafe-amb ] checkpoint ] ] if ;\r
+      '[ _ [ drop _ unsafe-amb ] checkpoint ] ] if ;\r

 \r
 PRIVATE> \r
 \r
 \r
 PRIVATE> \r
 \r


@@ -55,7 +55,7 @@ PRIVATE>
 \r
 MACRO: amb-execute ( seq -- quot )\r
     [ length 1 - ] [ <enum> [ 1quotation ] assoc-map ] bi\r
 \r
 MACRO: amb-execute ( seq -- quot )\r
     [ length 1 - ] [ <enum> [ 1quotation ] assoc-map ] bi\r

-    '[ , 0 unsafe-number-from-to nip , case ] ;\r
+    '[ _ 0 unsafe-number-from-to nip _ case ] ;\r

 \r
 : if-amb ( true false -- )\r
     [\r
 \r
 : if-amb ( true false -- )\r
     [\r

diff --git a/extra/benchmark/dispatch2/dispatch2.factor b/extra/benchmark/dispatch2/dispatch2.factor
index 7145cd94f7a60facef902fe6fae943a4daa37d9d..93b42c3e6c9091ba5072e0d8f4115162f124d487 100644 (file)
--- a/extra/benchmark/dispatch2/dispatch2.factor
+++ b/extra/benchmark/dispatch2/dispatch2.factor
@@ -1,4 +1,4 @@
-USING: namespaces math sequences splitting grouping
+USING: make math sequences splitting grouping

 kernel columns float-arrays bit-arrays ;
 IN: benchmark.dispatch2
 
 kernel columns float-arrays bit-arrays ;
 IN: benchmark.dispatch2
 

diff --git a/extra/benchmark/dispatch3/dispatch3.factor b/extra/benchmark/dispatch3/dispatch3.factor
index d7809809413724ed3b54f7ff2f1517e1b2b7c81c..aa3d11e2fb7c3e6553fa60619deead02d68e0616 100644 (file)
--- a/extra/benchmark/dispatch3/dispatch3.factor
+++ b/extra/benchmark/dispatch3/dispatch3.factor
@@ -1,5 +1,5 @@
 USING: sequences math mirrors splitting grouping
 USING: sequences math mirrors splitting grouping

-kernel namespaces assocs alien.syntax columns
+kernel make assocs alien.syntax columns

 float-arrays bit-arrays ;
 IN: benchmark.dispatch3
 
 float-arrays bit-arrays ;
 IN: benchmark.dispatch3
 

diff --git a/extra/benchmark/mandel/mandel.factor b/extra/benchmark/mandel/mandel.factor
index e87765499b629a662b46f27aeb6487d4be78e821..31df9e4e700baf4be3cc3b286e1a0491dd2d1433 100755 (executable)
--- a/extra/benchmark/mandel/mandel.factor
+++ b/extra/benchmark/mandel/mandel.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays io kernel math math.functions math.order
-math.parser sequences byte-arrays byte-vectors io.files
-io.encodings.binary fry namespaces benchmark.mandel.params
+USING: arrays io kernel namespaces math math.functions
+math.order math.parser sequences byte-arrays byte-vectors
+io.files io.encodings.binary fry make benchmark.mandel.params

 benchmark.mandel.colors ;
 IN: benchmark.mandel
 
 benchmark.mandel.colors ;
 IN: benchmark.mandel
 


@@ -19,13 +19,13 @@ IN: benchmark.mandel
 
 : pixel ( c -- iterations )
     [ C{ 0.0 0.0 } max-iterations ] dip
 
 : pixel ( c -- iterations )
     [ C{ 0.0 0.0 } max-iterations ] dip

-    '[ sq , + ] [ absq 4.0 >= ] count-iterations ; inline
+    '[ sq _ + ] [ absq 4.0 >= ] count-iterations ; inline

 
 : color ( iterations -- color )
     [ color-map [ length mod ] keep nth ] [ B{ 0 0 0 } ] if* ; inline
 
 : render ( -- )
 
 : color ( iterations -- color )
     [ color-map [ length mod ] keep nth ] [ B{ 0 0 0 } ] if* ; inline
 
 : render ( -- )

-    height [ width swap '[ , c pixel color % ] each ] each ; inline
+    height [ width swap '[ _ c pixel color % ] each ] each ; inline

 
 : ppm-header ( -- )
     "P6\n" % width # " " % height # "\n255\n" % ; inline
 
 : ppm-header ( -- )
     "P6\n" % width # " " % height # "\n255\n" % ; inline

diff --git a/extra/benchmark/nsieve-bits/nsieve-bits.factor b/extra/benchmark/nsieve-bits/nsieve-bits.factor
index 4970b018daa7777de08ea1b7a9239fe800c72e12..ddb70972b9df1757d47e6abdd71c9475a167c801 100644 (file)
--- a/extra/benchmark/nsieve-bits/nsieve-bits.factor
+++ b/extra/benchmark/nsieve-bits/nsieve-bits.factor
@@ -1,6 +1,6 @@
 IN: benchmark.nsieve-bits
 USING: math math.parser sequences sequences.private kernel
 IN: benchmark.nsieve-bits
 USING: math math.parser sequences sequences.private kernel

-bit-arrays namespaces io ;
+bit-arrays make io ;

 
 : clear-flags ( step i seq -- )
     2dup length >= [
 
 : clear-flags ( step i seq -- )
     2dup length >= [

diff --git a/extra/benchmark/nsieve/nsieve.factor b/extra/benchmark/nsieve/nsieve.factor
index dd4696232255372f62771c24a65e0f3d9eadf425..76d991f7347f387d1192748b06a2e53222301cdc 100644 (file)
--- a/extra/benchmark/nsieve/nsieve.factor
+++ b/extra/benchmark/nsieve/nsieve.factor
@@ -1,6 +1,6 @@
 IN: benchmark.nsieve
 USING: math math.parser sequences sequences.private kernel
 IN: benchmark.nsieve
 USING: math math.parser sequences sequences.private kernel

-arrays namespaces io ;
+arrays make io ;

 
 : clear-flags ( step i seq -- )
     2dup length >= [
 
 : clear-flags ( step i seq -- )
     2dup length >= [

diff --git a/extra/benchmark/raytracer/raytracer.factor b/extra/benchmark/raytracer/raytracer.factor
index d22f339ed4151c2f7f9673971d1be6607fc9e810..69454505a5ca5a282c73fce0b6863bac0071619f 100755 (executable)
--- a/extra/benchmark/raytracer/raytracer.factor
+++ b/extra/benchmark/raytracer/raytracer.factor
@@ -3,7 +3,7 @@
 
 USING: arrays accessors float-arrays io io.files
 io.encodings.binary kernel math math.functions math.vectors
 
 USING: arrays accessors float-arrays io io.files
 io.encodings.binary kernel math math.functions math.vectors

-math.parser namespaces sequences sequences.private words ;
+math.parser make sequences sequences.private words ;

 IN: benchmark.raytracer
 
 ! parameters
 IN: benchmark.raytracer
 
 ! parameters

diff --git a/extra/bitfields/bitfields.factor b/extra/bitfields/bitfields.factor
index 76e8d7883d4180deec732a69fb8db32b4555acb1..5eb41cd94389b62dd3356f3a8b2c6d18a3c5fa26 100755 (executable)
--- a/extra/bitfields/bitfields.factor
+++ b/extra/bitfields/bitfields.factor
@@ -1,6 +1,6 @@
-USING: parser lexer kernel math sequences namespaces assocs summary
-words splitting math.parser arrays sequences.next mirrors
-generalizations compiler.units ;
+USING: parser lexer kernel math sequences namespaces make assocs
+summary words splitting math.parser arrays sequences.next
+mirrors generalizations compiler.units ;

 IN: bitfields
 
 ! Example:
 IN: bitfields
 
 ! Example:

diff --git a/extra/builder/release/upload/upload.factor b/extra/builder/release/upload/upload.factor
index 32a27f82fdeb9705ee2e342341e2048e0fd56f11..19d3936fd9e0e5048c426ec9702373c4687df8a1 100644 (file)
--- a/extra/builder/release/upload/upload.factor
+++ b/extra/builder/release/upload/upload.factor
@@ -1,5 +1,5 @@
 
 

-USING: kernel namespaces sequences arrays io io.files
+USING: kernel namespaces make sequences arrays io io.files

        builder.util
        builder.common
        builder.release.archive ;
        builder.util
        builder.common
        builder.release.archive ;

diff --git a/extra/cfdg/cfdg.factor b/extra/cfdg/cfdg.factor
index 121c835105ba959ebe9c831509515c0dc43fd3c5..99d5dbbc48201ccd26f947541c2eb4efda65c9f9 100644 (file)
--- a/extra/cfdg/cfdg.factor
+++ b/extra/cfdg/cfdg.factor
@@ -1,5 +1,5 @@
 
 

-USING: kernel alien.c-types combinators namespaces arrays
+USING: kernel alien.c-types combinators namespaces make arrays

        sequences sequences.lib namespaces.lib splitting
        math math.functions math.vectors math.trig
        opengl.gl opengl.glu opengl ui ui.gadgets.slate
        sequences sequences.lib namespaces.lib splitting
        math math.functions math.vectors math.trig
        opengl.gl opengl.glu opengl ui ui.gadgets.slate

diff --git a/extra/combinators/cleave/cleave.factor b/extra/combinators/cleave/cleave.factor
index f5aeeff61916f9098696863c1c9c1d1136c67090..e57116a25b7ad1a6bc5c9f6adf8796eacc57d157 100755 (executable)
--- a/extra/combinators/cleave/cleave.factor
+++ b/extra/combinators/cleave/cleave.factor
@@ -21,7 +21,7 @@ MACRO: ncleave ( seq n -- quot ) [ncleave] ;
 ! Cleave into array
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 ! Cleave into array
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

-: [narr] ( seq n -- quot ) over length '[ , , ncleave , narray ] ;
+: [narr] ( seq n -- quot ) over length '[ _ _ ncleave _ narray ] ;

 
 MACRO: narr ( seq n -- array ) [narr] ;
 
 
 MACRO: narr ( seq n -- array ) [narr] ;
 


@@ -34,11 +34,11 @@ MACRO: 3arr ( seq -- array ) 3 [narr] ;
 
 MACRO: <arr> ( seq -- )
   [ >quots ] [ length ] bi
 
 MACRO: <arr> ( seq -- )
   [ >quots ] [ length ] bi

- '[ , cleave , narray ] ;
+ '[ _ cleave _ narray ] ;

 
 MACRO: <2arr> ( seq -- )
   [ >quots ] [ length ] bi
 
 MACRO: <2arr> ( seq -- )
   [ >quots ] [ length ] bi

- '[ , 2cleave , narray ] ;
+ '[ _ 2cleave _ narray ] ;

 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 


@@ -58,7 +58,7 @@ MACRO: <2arr> ( seq -- )
 
 MACRO: <arr*> ( seq -- )
   [ >quots ] [ length ] bi
 
 MACRO: <arr*> ( seq -- )
   [ >quots ] [ length ] bi

- '[ , spread , narray ] ;
+ '[ _ spread _ narray ] ;

 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

diff --git a/extra/combinators/conditional/conditional.factor b/extra/combinators/conditional/conditional.factor
index cb27ef3f55b11bb0553d28f3b29de5a7038d2bfb..3c9d6d24368ca455e7538af31eb800fbd8666566 100644 (file)
--- a/extra/combinators/conditional/conditional.factor
+++ b/extra/combinators/conditional/conditional.factor
@@ -5,7 +5,7 @@ IN: combinators.conditional
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

-MACRO: 1if ( test then else -- ) '[ dup @ , , if ] ;
+MACRO: 1if ( test then else -- ) '[ dup @ _ _ if ] ;

 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

diff --git a/extra/combinators/lib/lib.factor b/extra/combinators/lib/lib.factor
index b2577e663685112ac00edb9d3341d9d94b80d722..dd8fbd89f57b220c24930a11b501e8ae05211245 100755 (executable)
--- a/extra/combinators/lib/lib.factor
+++ b/extra/combinators/lib/lib.factor
@@ -2,7 +2,7 @@
 !                          Doug Coleman, Eduardo Cavazos,
 !                          Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 !                          Doug Coleman, Eduardo Cavazos,
 !                          Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel combinators fry namespaces quotations hashtables
+USING: kernel combinators fry namespaces make quotations hashtables

 sequences assocs arrays stack-checker effects math math.ranges
 generalizations macros continuations random locals accessors ;
 
 sequences assocs arrays stack-checker effects math math.ranges
 generalizations macros continuations random locals accessors ;
 


@@ -65,10 +65,10 @@ IN: combinators.lib
 MACRO: preserving ( predicate -- quot )
     dup infer in>>
     dup 1+
 MACRO: preserving ( predicate -- quot )
     dup infer in>>
     dup 1+

-    '[ , , nkeep , nrot ] ;
+    '[ _ _ nkeep _ nrot ] ;

 
 MACRO: ifte ( quot quot quot -- )
 
 MACRO: ifte ( quot quot quot -- )

-    '[ , preserving , , if ] ;
+    '[ _ preserving _ _ if ] ;

 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! switch
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! switch

diff --git a/extra/coroutines/coroutines.factor b/extra/coroutines/coroutines.factor
index 3c1f8490c4d41b534c7d76453b0da6b007ebb9d8..dc594abd2d5330858f52f918c40dda3758eba5e3 100644 (file)
--- a/extra/coroutines/coroutines.factor
+++ b/extra/coroutines/coroutines.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005 Chris Double, 2007 Clemens Hofreither.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2005 Chris Double, 2007 Clemens Hofreither.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel hashtables namespaces continuations quotations
+USING: kernel hashtables namespaces make continuations quotations

 accessors ;
 IN: coroutines
 
 accessors ;
 IN: coroutines
 

diff --git a/extra/ctags/ctags.factor b/extra/ctags/ctags.factor
index e8c5608375cb9e569658ce1c5f64399a429c3513..38160de0e9cf7780711dcf145c645ba7cf34d48b 100644 (file)
--- a/extra/ctags/ctags.factor
+++ b/extra/ctags/ctags.factor
@@ -6,7 +6,7 @@
 
 USING: arrays kernel sequences io io.files io.backend
 io.encodings.ascii math.parser vocabs definitions
 
 USING: arrays kernel sequences io io.files io.backend
 io.encodings.ascii math.parser vocabs definitions

-namespaces words sorting ;
+namespaces make words sorting ;

 IN: ctags
 
 : ctag-word ( ctag -- word )
 IN: ctags
 
 : ctag-word ( ctag -- word )

diff --git a/extra/ctags/etags/etags.factor b/extra/ctags/etags/etags.factor
index 8cc8c284b101eeee59c92843ad0e977bc447e34c..9fe63e914e6bf65f6c4a013b63f02a34c746eab1 100644 (file)
--- a/extra/ctags/etags/etags.factor
+++ b/extra/ctags/etags/etags.factor
@@ -4,8 +4,8 @@
 ! Emacs Etags generator
 ! Alfredo Beaumont <alfredo.beaumont@gmail.com>
 USING: kernel sequences sorting assocs words prettyprint ctags
 ! Emacs Etags generator
 ! Alfredo Beaumont <alfredo.beaumont@gmail.com>
 USING: kernel sequences sorting assocs words prettyprint ctags

-io.encodings.ascii io.files math math.parser namespaces strings locals
-shuffle io.backend arrays ;
+io.encodings.ascii io.files math math.parser namespaces make
+strings shuffle io.backend arrays ;

 IN: ctags.etags
 
 : etag-at ( key hash -- vector )
 IN: ctags.etags
 
 : etag-at ( key hash -- vector )

diff --git a/extra/demos/demos.factor b/extra/demos/demos.factor
index 40149bafa992874a24b8f923a8d2da4fb7ebe9fe..b411df1e3072baa12d74db4511327ec4516ceb15 100644 (file)
--- a/extra/demos/demos.factor
+++ b/extra/demos/demos.factor
@@ -10,7 +10,7 @@ IN: demos
 : demo-vocabs ( -- seq ) "demos" tagged [ second ] map concat [ name>> ] map ;
 
 : <run-vocab-button> ( vocab-name -- button )
 : demo-vocabs ( -- seq ) "demos" tagged [ second ] map concat [ name>> ] map ;
 
 : <run-vocab-button> ( vocab-name -- button )

-  dup '[ drop [ , run ] call-listener ] <bevel-button> { 0 0 } >>align ;
+  dup '[ drop [ _ run ] call-listener ] <bevel-button> { 0 0 } >>align ;

 
 : <demo-runner> ( -- gadget )
   <pile> 1 >>fill demo-vocabs [ <run-vocab-button> add-gadget ] each ;
 
 : <demo-runner> ( -- gadget )
   <pile> 1 >>fill demo-vocabs [ <run-vocab-button> add-gadget ] each ;

diff --git a/extra/display-stack/display-stack.factor b/extra/display-stack/display-stack.factor
index 8da252f294576dca2b0cbfd1dbb8c5e51789d5ae..98af43fec867a2404f5b2cf6e281f5e667d2eb34 100644 (file)
--- a/extra/display-stack/display-stack.factor
+++ b/extra/display-stack/display-stack.factor
@@ -1,6 +1,6 @@
 
 USING: kernel namespaces sequences math
 
 USING: kernel namespaces sequences math

-       listener io prettyprint sequences.lib fry ;
+       listener io prettyprint sequences.lib bake bake.fry ;

 
 IN: display-stack
 
 
 IN: display-stack
 

diff --git a/extra/dns/server/server.factor b/extra/dns/server/server.factor
index 16677d87613f49eee4d587f7cfb3eae3b0c47bf7..ad16db7b4157a55e40def0551110bdab5bcde1b3 100644 (file)
--- a/extra/dns/server/server.factor
+++ b/extra/dns/server/server.factor
@@ -2,7 +2,7 @@
 USING: kernel combinators sequences sets math threads namespaces continuations
        debugger io io.sockets unicode.case accessors destructors
        combinators.cleave combinators.lib combinators.short-circuit 
 USING: kernel combinators sequences sets math threads namespaces continuations
        debugger io io.sockets unicode.case accessors destructors
        combinators.cleave combinators.lib combinators.short-circuit 

-       newfx fry
+       newfx bake bake.fry

        dns dns.util dns.misc ;
 
 IN: dns.server
        dns dns.util dns.misc ;
 
 IN: dns.server

diff --git a/extra/dns/util/util.factor b/extra/dns/util/util.factor
index 35af74b92acb2e0f4d9c449c0dfca926f6f22912..96cf6c0a1ee7aab54d8bb441de3ae5bf27ce3b2b 100644 (file)
--- a/extra/dns/util/util.factor
+++ b/extra/dns/util/util.factor
@@ -1,5 +1,5 @@
 
 

-USING: kernel sequences sorting math math.order macros fry ;
+USING: kernel sequences sorting math math.order macros bake bake.fry ;

 
 IN: dns.util
 
 
 IN: dns.util
 

diff --git a/extra/faq/faq.factor b/extra/faq/faq.factor
index 525cef68edd3492bdf4d9f40ec22d3c4c23ca517..1ab348e434605ea0be43999a788fc2da58288d7e 100644 (file)
--- a/extra/faq/faq.factor
+++ b/extra/faq/faq.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: xml kernel sequences xml.utilities combinators.lib
 math xml.data arrays assocs xml.generator xml.writer namespaces
 ! See http://factorcode.org/license.txt for BSD license.
 USING: xml kernel sequences xml.utilities combinators.lib
 math xml.data arrays assocs xml.generator xml.writer namespaces

-math.parser io accessors ;
+make math.parser io accessors ;

 IN: faq
 
 : find-after ( seq quot -- elem after )
 IN: faq
 
 : find-after ( seq quot -- elem after )

diff --git a/extra/fjsc/fjsc.factor b/extra/fjsc/fjsc.factor
index ac3b447f1c13d68d04aeba470f4a4e38a766abf9..c308c94054db8b7860f73a5806a1c3587b71041e 100755 (executable)
--- a/extra/fjsc/fjsc.factor
+++ b/extra/fjsc/fjsc.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006 Chris Double. All Rights Reserved.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2006 Chris Double. All Rights Reserved.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors kernel peg strings sequences math
-math.parser namespaces words quotations arrays hashtables io
+USING: accessors kernel peg strings sequences math math.parser
+namespaces make words quotations arrays hashtables io

 io.streams.string assocs ascii peg.parsers accessors ;
 IN: fjsc
 
 io.streams.string assocs ascii peg.parsers accessors ;
 IN: fjsc
 

diff --git a/extra/ftp/client/client.factor b/extra/ftp/client/client.factor
index 642d2ce8cd7701661d5e9bd8d197aff5c2a9a97e..9b9a2214c168da7671a88d7ac2c0798326e95fc7 100644 (file)
--- a/extra/ftp/client/client.factor
+++ b/extra/ftp/client/client.factor
@@ -154,7 +154,7 @@ GENERIC: ftp-download ( path obj -- )
 
 : with-ftp-client ( ftp-client quot -- )
     dupd '[
 
 : with-ftp-client ( ftp-client quot -- )
     dupd '[

-        , [ ftp-login ] [ @ ] bi
+        _ [ ftp-login ] [ @ ] bi

         ftp-quit drop
     ] >r ftp-connect r> with-stream ; inline
 
         ftp-quit drop
     ] >r ftp-connect r> with-stream ; inline
 

diff --git a/extra/ftp/server/server.factor b/extra/ftp/server/server.factor
index 21a32d1776d7d90bf69ab29ee6de3d58a8338194..3ecf8d2f3fede0c8c7d112dfa5f533051acdf39a 100644 (file)
--- a/extra/ftp/server/server.factor
+++ b/extra/ftp/server/server.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: combinators.short-circuit accessors combinators io io.encodings.8-bit
-io.encodings io.encodings.binary io.encodings.utf8 io.files
-io.sockets kernel math.parser namespaces sequences
-ftp io.unix.launcher.parser unicode.case splitting assocs
-classes io.servers.connection destructors calendar io.timeouts
-io.streams.duplex threads continuations math
-concurrency.promises byte-arrays ;
+USING: combinators.short-circuit accessors combinators io
+io.encodings.8-bit io.encodings io.encodings.binary
+io.encodings.utf8 io.files io.sockets kernel math.parser
+namespaces make sequences ftp io.unix.launcher.parser
+unicode.case splitting assocs classes io.servers.connection
+destructors calendar io.timeouts io.streams.duplex threads
+continuations math concurrency.promises byte-arrays ;

 IN: ftp.server
 
 SYMBOL: client
 IN: ftp.server
 
 SYMBOL: client

diff --git a/extra/graph-theory/graph-theory.factor b/extra/graph-theory/graph-theory.factor
index 322f17d2dd07ef35a986bcaa726915c556ab1f69..842f4d1f388e85cda8817aadf8eafce0d319c5cc 100644 (file)
--- a/extra/graph-theory/graph-theory.factor
+++ b/extra/graph-theory/graph-theory.factor
@@ -35,10 +35,10 @@ M: graph num-vertices
     vertices length ;
 
 M: graph num-edges
     vertices length ;
 
 M: graph num-edges

-   [ vertices ] [ '[ , adjlist length ] map sum ] bi ;
+   [ vertices ] [ '[ _ adjlist length ] map sum ] bi ;

 
 M: graph adjlist
 
 M: graph adjlist

-    [ vertices ] [ swapd '[ , swap , adj? ] filter ] bi ;
+    [ vertices ] [ swapd '[ _ swap _ adj? ] filter ] bi ;

 
 M: graph adj?
     swapd adjlist index >boolean ;
 
 M: graph adj?
     swapd adjlist index >boolean ;


@@ -50,11 +50,11 @@ M: graph delete-edge
     [ delete-edge* ] [ swapd delete-edge* ] 3bi ;
 
 : add-blank-vertices ( seq graph -- )
     [ delete-edge* ] [ swapd delete-edge* ] 3bi ;
 
 : add-blank-vertices ( seq graph -- )

-    '[ , add-blank-vertex ] each ;
+    '[ _ add-blank-vertex ] each ;

 
 : delete-vertex ( index graph -- )
     [ adjlist ]
 
 : delete-vertex ( index graph -- )
     [ adjlist ]

-    [ '[ , , 3dup adj? [ delete-edge* ] [ 3drop ] if ] each ]
+    [ '[ _ _ 3dup adj? [ delete-edge* ] [ 3drop ] if ] each ]

     [ delete-blank-vertex ] 2tri ;
 
 <PRIVATE
     [ delete-blank-vertex ] 2tri ;
 
 <PRIVATE


@@ -67,22 +67,22 @@ M: graph delete-edge
     { [ 2drop visited? get t -rot set-at ] 
       [ drop call ]
       [ [ graph get adjlist ] 2dip
     { [ 2drop visited? get t -rot set-at ] 
       [ drop call ]
       [ [ graph get adjlist ] 2dip

-        '[ dup visited? get at [ drop ] [ , , (depth-first) ] if ] each ]
+        '[ dup visited? get at [ drop ] [ _ _ (depth-first) ] if ] each ]

       [ nip call ] } 3cleave ; inline
 
 PRIVATE>
 
 : depth-first ( v graph pre post -- ?list ? )
       [ nip call ] } 3cleave ; inline
 
 PRIVATE>
 
 : depth-first ( v graph pre post -- ?list ? )

-    '[ , , (depth-first) visited? get ] swap search-wrap ; inline
+    '[ _ _ (depth-first) visited? get ] swap search-wrap ; inline

 
 : full-depth-first ( graph pre post tail -- ? )
     '[ [ visited? get [ nip not ] assoc-find ] 
 
 : full-depth-first ( graph pre post tail -- ? )
     '[ [ visited? get [ nip not ] assoc-find ] 

-       [ drop , , (depth-first) @ ] 
+       [ drop _ _ (depth-first) @ ] 

        [ 2drop ] while ] swap search-wrap ; inline
 
 : dag? ( graph -- ? )
     V{ } clone swap [ 2dup swap push dupd
        [ 2drop ] while ] swap search-wrap ; inline
 
 : dag? ( graph -- ? )
     V{ } clone swap [ 2dup swap push dupd

-                     '[ , swap graph get adj? not ] all? 
+                     '[ _ swap graph get adj? not ] all? 

                       [ end-search ] unless ]
                     [ drop dup pop* ] [ ] full-depth-first nip ;
 
                       [ end-search ] unless ]
                     [ drop dup pop* ] [ ] full-depth-first nip ;
 

diff --git a/extra/graph-theory/sparse/sparse.factor b/extra/graph-theory/sparse/sparse.factor
index 33c5505f0a89c24cd1f00e1870b183c92a249f78..5c6365b563944ba8a67d030425425fdec974cc91 100644 (file)
--- a/extra/graph-theory/sparse/sparse.factor
+++ b/extra/graph-theory/sparse/sparse.factor
@@ -12,7 +12,7 @@ TUPLE: sparse-graph alist ;
 
 : >sparse-graph ( graph -- sparse-graph )
     [ vertices ] keep
 
 : >sparse-graph ( graph -- sparse-graph )
     [ vertices ] keep

-    '[ dup , adjlist 2array ] map >hashtable sparse-graph boa ;
+    '[ dup _ adjlist 2array ] map >hashtable sparse-graph boa ;

 
 INSTANCE: sparse-graph graph
 
 
 INSTANCE: sparse-graph graph
 

diff --git a/extra/html/parser/analyzer/analyzer.factor b/extra/html/parser/analyzer/analyzer.factor
index 29ccc345d3ed763a01a4a837d2765cc30c2a1edd..b82b5662dc0a28adb3227338883d20983af48630 100755 (executable)
--- a/extra/html/parser/analyzer/analyzer.factor
+++ b/extra/html/parser/analyzer/analyzer.factor
@@ -1,6 +1,7 @@
 USING: assocs html.parser kernel math sequences strings ascii
 USING: assocs html.parser kernel math sequences strings ascii

-arrays generalizations shuffle unicode.case namespaces splitting
-http sequences.lib accessors io combinators http.client urls ;
+arrays generalizations shuffle unicode.case namespaces make
+splitting http sequences.lib accessors io combinators
+http.client urls ;

 IN: html.parser.analyzer
 
 TUPLE: link attributes clickable ;
 IN: html.parser.analyzer
 
 TUPLE: link attributes clickable ;

diff --git a/extra/html/parser/parser.factor b/extra/html/parser/parser.factor
index ccd225e6e0b9341eaf8aeb911bb2f2eba03e2992..95bfa938a25b717fe1d595782a5007fd63f4c76a 100644 (file)
--- a/extra/html/parser/parser.factor
+++ b/extra/html/parser/parser.factor
@@ -1,6 +1,6 @@
 USING: accessors arrays html.parser.utils hashtables io kernel
 USING: accessors arrays html.parser.utils hashtables io kernel

-namespaces prettyprint quotations
-sequences splitting state-parser strings unicode.categories unicode.case
+namespaces make prettyprint quotations sequences splitting
+state-parser strings unicode.categories unicode.case

 sequences.lib ;
 IN: html.parser
 
 sequences.lib ;
 IN: html.parser
 

diff --git a/extra/inverse/inverse.factor b/extra/inverse/inverse.factor
index b843c73983d6adafb616fef992dee8bc98ec9a7f..7f55b609e358eac1f36f9459ab7296856afa8d8e 100755 (executable)
--- a/extra/inverse/inverse.factor
+++ b/extra/inverse/inverse.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel words summary slots quotations
 sequences assocs math arrays stack-checker effects generalizations
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel words summary slots quotations
 sequences assocs math arrays stack-checker effects generalizations

-continuations debugger classes.tuple namespaces vectors
+continuations debugger classes.tuple namespaces make vectors

 bit-arrays byte-arrays strings sbufs math.functions macros
 sequences.private combinators mirrors
 combinators.short-circuit ;
 bit-arrays byte-arrays strings sbufs math.functions macros
 sequences.private combinators mirrors
 combinators.short-circuit ;

diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 575c26972f39c8ec9661fa2b2a371d702fd9882a..2474fd643ac68fb7cdf93465bd746c02692c9074 100644 (file)
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -334,7 +334,7 @@ DEFER: (connect-irc)
 
 : set+run-listener ( name irc-listener -- )
     over irc> listeners>> set-at
 
 : set+run-listener ( name irc-listener -- )
     over irc> listeners>> set-at

-    '[ , listener-loop ] "listener" spawn-irc-loop ;
+    '[ _ listener-loop ] "listener" spawn-irc-loop ;

 
 GENERIC: (add-listener) ( irc-listener -- )
 
 
 GENERIC: (add-listener) ( irc-listener -- )
 


@@ -342,7 +342,7 @@ M: irc-channel-listener (add-listener) ( irc-channel-listener -- )
     [ [ name>> ] [ password>> ] bi /JOIN ]
     [ [ [ drop irc> join-messages>> ]
         [ timeout>> ]
     [ [ name>> ] [ password>> ] bi /JOIN ]
     [ [ [ drop irc> join-messages>> ]
         [ timeout>> ]

-        [ name>> '[ trailing>> , = ] ]
+        [ name>> '[ trailing>> _ = ] ]

         tri mailbox-get-timeout? trailing>> ] keep set+run-listener
     ] bi ;
 
         tri mailbox-get-timeout? trailing>> ] keep set+run-listener
     ] bi ;
 


@@ -382,10 +382,10 @@ PRIVATE>
       spawn-irc ] with-irc-client ;
 
 : add-listener ( irc-listener irc-client -- )
       spawn-irc ] with-irc-client ;
 
 : add-listener ( irc-listener irc-client -- )

-    swap '[ , (add-listener) ] with-irc-client ;
+    swap '[ _ (add-listener) ] with-irc-client ;

 
 : remove-listener ( irc-listener irc-client -- )
 
 : remove-listener ( irc-listener irc-client -- )

-    swap '[ , (remove-listener) ] with-irc-client ;
+    swap '[ _ (remove-listener) ] with-irc-client ;

 
 : write-message ( message irc-listener -- ) out-messages>> mailbox-put ;
 : read-message ( irc-listener -- message ) in-messages>> mailbox-get ;
 
 : write-message ( message irc-listener -- ) out-messages>> mailbox-put ;
 : read-message ( irc-listener -- message ) in-messages>> mailbox-get ;

diff --git a/extra/irc/messages/messages.factor b/extra/irc/messages/messages.factor
index d3eca92f156b5fc2b1a8f7f61c2ff92713275d23..16066199edef33ea6eb32ff75740d5f1c37d7437 100755 (executable)
--- a/extra/irc/messages/messages.factor
+++ b/extra/irc/messages/messages.factor
@@ -77,7 +77,7 @@ M: irc-message irc-message>server-line ( irc-message -- string )
 ! ======================================
 
 : split-at-first ( seq separators -- before after )
 ! ======================================
 
 : split-at-first ( seq separators -- before after )

-    dupd '[ , member? ] find
+    dupd '[ _ member? ] find

         [ cut 1 tail ]
         [ swap ]
     if ;
         [ cut 1 tail ]
         [ swap ]
     if ;


@@ -127,4 +127,4 @@ M: sender-in-prefix irc-message-sender ( sender-in-prefix -- sender )
     } case
     [ [ tuple-slots ] [ parameters>> ] bi append ] dip
     [ all-slots over [ length ] bi@ min head >quotation ] keep
     } case
     [ [ tuple-slots ] [ parameters>> ] bi append ] dip
     [ all-slots over [ length ] bi@ min head >quotation ] keep

-    '[ @ , boa ] call ;
+    '[ @ _ boa ] call ;

diff --git a/extra/irc/ui/ui.factor b/extra/irc/ui/ui.factor
index 457a98482056a513f25dc0b4ae771d26507302bb..1e4bcf35f81911e238b5689518b7dd5ad964f09a 100755 (executable)
--- a/extra/irc/ui/ui.factor
+++ b/extra/irc/ui/ui.factor
@@ -140,17 +140,17 @@ M: object time-happened drop now ;
 GENERIC: handle-inbox ( tab message -- )\r
 \r
 : value-labels ( assoc val -- seq )\r
 GENERIC: handle-inbox ( tab message -- )\r
 \r
 : value-labels ( assoc val -- seq )\r

-    '[ nip , = ] assoc-filter keys sort-strings [ <label> ] map ;\r
+    '[ nip _ = ] assoc-filter keys sort-strings [ <label> ] map ;\r

 \r
 : add-gadget-color ( pack seq color -- pack )\r
 \r
 : add-gadget-color ( pack seq color -- pack )\r

-    '[ , >>color add-gadget ] each ;\r
+    '[ _ >>color add-gadget ] each ;\r

 \r
 M: object handle-inbox\r
     nip print-irc ;\r
 \r
 : display ( stream tab -- )\r
 \r
 M: object handle-inbox\r
     nip print-irc ;\r
 \r
 : display ( stream tab -- )\r

-    '[ , [ [ t ]\r
-           [ , dup listener>> read-message handle-inbox ]\r
+    '[ _ [ [ t ]\r
+           [ _ dup listener>> read-message handle-inbox ]\r

            [  ] while ] with-output-stream ] "ircv" spawn drop ;\r
 \r
 : <irc-pane> ( tab -- tab pane )\r
            [  ] while ] with-output-stream ] "ircv" spawn drop ;\r
 \r
 : <irc-pane> ( tab -- tab pane )\r


@@ -168,7 +168,7 @@ TUPLE: irc-editor < editor outstream tab ;
       [ [ irc-tab? ] find-parent ]\r
       [ editor-string ]\r
       [ "" swap set-editor-string ] } cleave\r
       [ [ irc-tab? ] find-parent ]\r
       [ editor-string ]\r
       [ "" swap set-editor-string ] } cleave\r

-     '[ , irc-tab set , parse-message ] with-output-stream ;\r
+     '[ _ irc-tab set _ parse-message ] with-output-stream ;\r

 \r
 irc-editor "general" f {\r
     { T{ key-down f f "RET" } editor-send }\r
 \r
 irc-editor "general" f {\r
     { T{ key-down f f "RET" } editor-send }\r

diff --git a/extra/joystick-demo/joystick-demo.factor b/extra/joystick-demo/joystick-demo.factor
index b5289dbcbf9f8597182870f709c79636c0f03ad0..6a0b9f728f2b7d905c533c09d9bf6a3433a0d54c 100755 (executable)
--- a/extra/joystick-demo/joystick-demo.factor
+++ b/extra/joystick-demo/joystick-demo.factor
@@ -125,7 +125,7 @@ TUPLE: joystick-demo-gadget < pack axis raxis controller buttons alarm ;
     [ (update-axes) ] [ kill-update-axes ] if* ;
 
 M: joystick-demo-gadget graft*
     [ (update-axes) ] [ kill-update-axes ] if* ;
 
 M: joystick-demo-gadget graft*

-    dup '[ , update-axes ] FREQUENCY every >>alarm
+    dup '[ _ update-axes ] FREQUENCY every >>alarm

     drop ;
 
 M: joystick-demo-gadget ungraft*
     drop ;
 
 M: joystick-demo-gadget ungraft*

diff --git a/extra/key-caps/key-caps.factor b/extra/key-caps/key-caps.factor
index e14a46a967cb4a51bd6058bee593ab11ebd3cf32..0865b0ada2feb696db288220b96a755a365a1e97 100755 (executable)
--- a/extra/key-caps/key-caps.factor
+++ b/extra/key-caps/key-caps.factor
@@ -162,7 +162,7 @@ M: key-caps-gadget pref-dim* drop KEYBOARD-SIZE ;
     relayout-1 ;
 
 M: key-caps-gadget graft*
     relayout-1 ;
 
 M: key-caps-gadget graft*

-    dup '[ , update-key-caps-state ] FREQUENCY every >>alarm
+    dup '[ _ update-key-caps-state ] FREQUENCY every >>alarm

     drop ;
 
 M: key-caps-gadget ungraft*
     drop ;
 
 M: key-caps-gadget ungraft*

diff --git a/extra/lisp/lisp.factor b/extra/lisp/lisp.factor
index e004af865592e298635e93ccfdeedaaed41bbc63..2866e63c69736688fe773f5c062968e115026bcb 100644 (file)
--- a/extra/lisp/lisp.factor
+++ b/extra/lisp/lisp.factor
@@ -21,16 +21,16 @@ DEFER: define-lisp-macro
 
 : convert-cond ( cons -- quot )
     cdr [ 2car [ convert-form ] bi@ 2array ]
 
 : convert-cond ( cons -- quot )
     cdr [ 2car [ convert-form ] bi@ 2array ]

-    { } lmap-as '[ , cond ] ;
+    { } lmap-as '[ _ cond ] ;

 
 : convert-general-form ( cons -- quot )
 
 : convert-general-form ( cons -- quot )

-    uncons [ convert-body ] [ convert-form ] bi* '[ , @ funcall ] ;
+    uncons [ convert-body ] [ convert-form ] bi* '[ _ @ funcall ] ;

 
 ! words for convert-lambda
 <PRIVATE
 : localize-body ( assoc body -- newbody )
     {
 
 ! words for convert-lambda
 <PRIVATE
 : localize-body ( assoc body -- newbody )
     {

-      { [ dup list? ] [ [ lisp-symbol? ] rot '[ [ name>> , at ] [ ] bi or ] traverse ] }
+      { [ dup list? ] [ [ lisp-symbol? ] rot '[ [ name>> _ at ] [ ] bi or ] traverse ] }

       { [ dup lisp-symbol? ] [ name>> swap at ] }
      [ nip ]
     } cond ;
       { [ dup lisp-symbol? ] [ name>> swap at ] }
      [ nip ]
     } cond ;


@@ -46,7 +46,7 @@ DEFER: define-lisp-macro
 : rest-lambda ( body vars -- quot )
     "&rest" swap [ remove ] [ index ] 2bi
     [ localize-lambda <lambda> lambda-rewrite call ] dip
 : rest-lambda ( body vars -- quot )
     "&rest" swap [ remove ] [ index ] 2bi
     [ localize-lambda <lambda> lambda-rewrite call ] dip

-    swap '[ , cut '[ @ , seq>list ] call , call call ] 1quotation ;
+    swap '[ _ cut '[ @ _ seq>list ] call _ call call ] 1quotation ;

 
 : normal-lambda ( body vars -- quot )
     localize-lambda <lambda> lambda-rewrite '[ @ compose call call ] 1quotation ;
 
 : normal-lambda ( body vars -- quot )
     localize-lambda <lambda> lambda-rewrite '[ @ compose call call ] 1quotation ;


@@ -74,7 +74,7 @@ PRIVATE>
 
 : convert-begin ( cons -- quot )
     cdr [ convert-form ] [ ] lmap-as [ 1 tail* ] [ but-last ] bi
 
 : convert-begin ( cons -- quot )
     cdr [ convert-form ] [ ] lmap-as [ 1 tail* ] [ but-last ] bi

-    [ '[ { } , with-datastack drop ] ] map prepend '[ , [ call ] each ] ;
+    [ '[ { } _ with-datastack drop ] ] map prepend '[ _ [ call ] each ] ;

 
 : form-dispatch ( cons lisp-symbol -- quot )
     name>>
 
 : form-dispatch ( cons lisp-symbol -- quot )
     name>>


@@ -97,7 +97,7 @@ PRIVATE>
     {
       { [ dup cons? ] [ convert-list-form ] }
       { [ dup lisp-var? ] [ lookup-var 1quotation ] }
     {
       { [ dup cons? ] [ convert-list-form ] }
       { [ dup lisp-var? ] [ lookup-var 1quotation ] }

-      { [ dup lisp-symbol? ] [ '[ , lookup-var ] ] }
+      { [ dup lisp-symbol? ] [ '[ _ lookup-var ] ] }

      [ 1quotation ]
     } cond ;
 
      [ 1quotation ]
     } cond ;
 


@@ -138,7 +138,7 @@ M: no-such-var summary drop "No such variable" ;
     [ 1array [ call ] with-datastack >quotation ] dip curry call ; inline
 
 : define-primitive ( name vocab word -- )
     [ 1array [ call ] with-datastack >quotation ] dip curry call ; inline
 
 : define-primitive ( name vocab word -- )

-    swap lookup 1quotation '[ , compose call ] swap lisp-define ;
+    swap lookup 1quotation '[ _ compose call ] swap lisp-define ;

 
 : lookup-macro ( lisp-symbol -- lambda )
     name>> macro-env get at ;
 
 : lookup-macro ( lisp-symbol -- lambda )
     name>> macro-env get at ;

diff --git a/extra/lists/lazy/lazy.factor b/extra/lists/lazy/lazy.factor
index 5854e37702b770d429fa6fbfea3cc16b43ec4c1a..e60fcbaadff8ff988f97f9808435a8e40f5d742c 100644 (file)
--- a/extra/lists/lazy/lazy.factor
+++ b/extra/lists/lazy/lazy.factor
@@ -5,7 +5,7 @@
 ! Updated by Chris Double, September 2006
 ! Updated by James Cash, June 2008
 !
 ! Updated by Chris Double, September 2006
 ! Updated by James Cash, June 2008
 !

-USING: kernel sequences math vectors arrays namespaces
+USING: kernel sequences math vectors arrays namespaces make

 quotations promises combinators io lists accessors ;
 IN: lists.lazy
 
 quotations promises combinators io lists accessors ;
 IN: lists.lazy
 

diff --git a/extra/math/blas/vectors/vectors.factor b/extra/math/blas/vectors/vectors.factor
index 87bc6437c31713c1fca027701dc8ceef32159ec9..a135f08f28d3136961c2af375cac3d90e1e6e640 100755 (executable)
--- a/extra/math/blas/vectors/vectors.factor
+++ b/extra/math/blas/vectors/vectors.factor
@@ -62,7 +62,7 @@ METHOD: (blas-vector-like) { object object object double-complex-blas-vector }
     1 ;
 
 MACRO: (do-copy) ( copy make-vector -- )
     1 ;
 
 MACRO: (do-copy) ( copy make-vector -- )

-    '[ over 6 npick , 2dip 1 @ ] ;
+    '[ over 6 npick _ 2dip 1 @ ] ;

 
 : (prepare-swap) ( v1 v2 -- length v1-data v1-inc v2-data v2-inc v1 v2 )
     [
 
 : (prepare-swap) ( v1 v2 -- length v1-data v1-inc v2-data v2-inc v1 v2 )
     [


@@ -105,7 +105,7 @@ MACRO: (do-copy) ( copy make-vector -- )
 MACRO: (complex-nth) ( nth-quot -- )
     '[ 
         [ 2 * dup 1+ ] dip
 MACRO: (complex-nth) ( nth-quot -- )
     '[ 
         [ 2 * dup 1+ ] dip

-        , curry bi@ rect>
+        _ curry bi@ rect>

     ] ;
 
 : (c-complex-nth) ( n alien -- complex )
     ] ;
 
 : (c-complex-nth) ( n alien -- complex )


@@ -120,7 +120,7 @@ MACRO: (set-complex-nth) ( set-nth-quot -- )
             [ 2 * dup 1+ ] bi*
             swapd
         ] dip
             [ 2 * dup 1+ ] bi*
             swapd
         ] dip

-        , curry 2bi@ 
+        _ curry 2bi@ 

     ] ;
 
 : (set-c-complex-nth) ( complex n alien -- )
     ] ;
 
 : (set-c-complex-nth) ( complex n alien -- )

diff --git a/extra/math/combinatorics/combinatorics.factor b/extra/math/combinatorics/combinatorics.factor
index 6193edfb915d7cae6171e2a65682933c02804933..7c5d5ba4c04515a5605e23e8b4b12f267dd48244 100644 (file)
--- a/extra/math/combinatorics/combinatorics.factor
+++ b/extra/math/combinatorics/combinatorics.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007, 2008 Slava Pestov, Doug Coleman, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs kernel math math.order math.ranges mirrors
 ! Copyright (c) 2007, 2008 Slava Pestov, Doug Coleman, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs kernel math math.order math.ranges mirrors

-namespaces sequences sequences.lib sorting ;
+namespaces make sequences sequences.lib sorting ;

 IN: math.combinatorics
 
 <PRIVATE
 IN: math.combinatorics
 
 <PRIVATE

diff --git a/extra/math/numerical-integration/numerical-integration.factor b/extra/math/numerical-integration/numerical-integration.factor
index 163fc40c465c3d7fb51f69711daf933d3f3b1098..798d3a5e7154ee0fe81eaa4e35e11a4ba117b630 100644 (file)
--- a/extra/math/numerical-integration/numerical-integration.factor
+++ b/extra/math/numerical-integration/numerical-integration.factor
@@ -1,4 +1,4 @@
-USING: arrays kernel sequences namespaces math math.ranges
+USING: arrays kernel sequences namespaces make math math.ranges

 math.vectors vectors ;
 IN: math.numerical-integration
 
 math.vectors vectors ;
 IN: math.numerical-integration
 

diff --git a/extra/math/polynomials/polynomials.factor b/extra/math/polynomials/polynomials.factor
index 018b041afd493be3c12987584a8ff54d477d2845..8662bbb0895725d69e7de8784daee3739103835c 100644 (file)
--- a/extra/math/polynomials/polynomials.factor
+++ b/extra/math/polynomials/polynomials.factor
@@ -1,5 +1,5 @@
-USING: arrays kernel sequences vectors math math.vectors namespaces
-shuffle splitting sequences.lib math.order ;
+USING: arrays kernel sequences vectors math math.vectors
+namespaces make shuffle splitting sequences.lib math.order ;

 IN: math.polynomials
 
 ! Polynomials are vectors with the highest powers on the right:
 IN: math.polynomials
 
 ! Polynomials are vectors with the highest powers on the right:

diff --git a/extra/math/primes/factors/factors.factor b/extra/math/primes/factors/factors.factor
index 83d53c42153a59040665e4bb903881eeef9369c8..059bd67c188466d43079f278226879f7375d9a17 100644 (file)
--- a/extra/math/primes/factors/factors.factor
+++ b/extra/math/primes/factors/factors.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2007 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays kernel lists math math.primes namespaces sequences ;
+USING: arrays kernel lists math math.primes namespaces make
+sequences ;

 IN: math.primes.factors
 
 <PRIVATE
 IN: math.primes.factors
 
 <PRIVATE

diff --git a/extra/monads/monads.factor b/extra/monads/monads.factor
index bff720b2a36b506bcb5bc5d15f1bacbcb53cbf2e..e9ae1675323d53170bb47ccdd76739088b60c76e 100644 (file)
--- a/extra/monads/monads.factor
+++ b/extra/monads/monads.factor
@@ -22,7 +22,7 @@ M: monad return monad-of return ;
 M: monad fail   monad-of fail   ;
 
 : bind ( mvalue quot -- mvalue' ) swap >>= call ;
 M: monad fail   monad-of fail   ;
 
 : bind ( mvalue quot -- mvalue' ) swap >>= call ;

-: >>   ( mvalue k -- mvalue' ) '[ drop , ] bind ;
+: >>   ( mvalue k -- mvalue' ) '[ drop _ ] bind ;

 
 :: lift-m2 ( m1 m2 f monad -- m3 )
     m1 [| x1 | m2 [| x2 | x1 x2 f monad return ] bind ] bind ;
 
 :: lift-m2 ( m1 m2 f monad -- m3 )
     m1 [| x1 | m2 [| x2 | x1 x2 f monad return ] bind ] bind ;


@@ -34,7 +34,7 @@ M: monad fail   monad-of fail   ;
         ] bind
     ] bind ;
 
         ] bind
     ] bind ;
 

-M: monad fmap over '[ @ , return ] bind ;
+M: monad fmap over '[ @ _ return ] bind ;

 
 ! 'do' notation
 : do ( quots -- result ) unclip dip [ bind ] each ;
 
 ! 'do' notation
 : do ( quots -- result ) unclip dip [ bind ] each ;


@@ -51,7 +51,7 @@ M: identity monad-of drop identity-monad ;
 M: identity-monad return drop identity boa ;
 M: identity-monad fail   "Fail" throw ;
 
 M: identity-monad return drop identity boa ;
 M: identity-monad fail   "Fail" throw ;
 

-M: identity >>= value>> '[ , swap call ] ;
+M: identity >>= value>> '[ _ swap call ] ;

 
 : run-identity ( identity -- value ) value>> ;
 
 
 : run-identity ( identity -- value ) value>> ;
 


@@ -72,8 +72,8 @@ M: maybe monad-of drop maybe-monad ;
 M: maybe-monad return drop just ;
 M: maybe-monad fail   2drop nothing ;
 
 M: maybe-monad return drop just ;
 M: maybe-monad fail   2drop nothing ;
 

-M: nothing >>= '[ drop , ] ;
-M: just    >>= value>> '[ , swap call ] ;
+M: nothing >>= '[ drop _ ] ;
+M: just    >>= value>> '[ _ swap call ] ;

 
 : if-maybe ( maybe just-quot nothing-quot -- )
     pick nothing? [ 2nip call ] [ drop [ value>> ] dip call ] if ; inline
 
 : if-maybe ( maybe just-quot nothing-quot -- )
     pick nothing? [ 2nip call ] [ drop [ value>> ] dip call ] if ; inline


@@ -96,8 +96,8 @@ M: either monad-of drop either-monad ;
 M: either-monad return  drop right ;
 M: either-monad fail    drop left ;
 
 M: either-monad return  drop right ;
 M: either-monad fail    drop left ;
 

-M: left  >>= '[ drop , ] ;
-M: right >>= value>> '[ , swap call ] ;
+M: left  >>= '[ drop _ ] ;
+M: right >>= value>> '[ _ swap call ] ;

 
 : if-either ( value left-quot right-quot -- )
     [ [ value>> ] [ left? ] bi ] 2dip if ; inline
 
 : if-either ( value left-quot right-quot -- )
     [ [ value>> ] [ left? ] bi ] 2dip if ; inline


@@ -112,7 +112,7 @@ M: array-monad fail   2drop { } ;
 
 M: array monad-of drop array-monad ;
 
 
 M: array monad-of drop array-monad ;
 

-M: array >>= '[ , swap map concat ] ;
+M: array >>= '[ _ swap map concat ] ;

 
 ! List
 SINGLETON: list-monad
 
 ! List
 SINGLETON: list-monad


@@ -124,7 +124,7 @@ M: list-monad fail   2drop nil ;
 
 M: list monad-of drop list-monad ;
 
 
 M: list monad-of drop list-monad ;
 

-M: list >>= '[ , swap lazy-map lconcat ] ;
+M: list >>= '[ _ swap lazy-map lconcat ] ;

 
 ! State
 SINGLETON: state-monad
 
 ! State
 SINGLETON: state-monad


@@ -137,15 +137,15 @@ INSTANCE: state monad
 
 M: state monad-of drop state-monad ;
 
 
 M: state monad-of drop state-monad ;
 

-M: state-monad return drop '[ , 2array ] state ;
+M: state-monad return drop '[ _ 2array ] state ;

 M: state-monad fail   "Fail" throw ;
 
 : mcall ( state -- ) quot>> call ;
 
 M: state-monad fail   "Fail" throw ;
 
 : mcall ( state -- ) quot>> call ;
 

-M: state >>= '[ , swap '[ , mcall first2 @ mcall ] state ] ;
+M: state >>= '[ _ swap '[ _ mcall first2 @ mcall ] state ] ;

 
 : get-st ( -- state ) [ dup 2array ] state ;
 
 : get-st ( -- state ) [ dup 2array ] state ;

-: put-st ( value -- state ) '[ drop , f 2array ] state ;
+: put-st ( value -- state ) '[ drop _ f 2array ] state ;

 
 : run-st ( state initial -- ) swap mcall second ;
 
 
 : run-st ( state initial -- ) swap mcall second ;
 


@@ -161,15 +161,15 @@ INSTANCE: reader monad
 
 M: reader monad-of drop reader-monad ;
 
 
 M: reader monad-of drop reader-monad ;
 

-M: reader-monad return drop '[ drop , ] reader ;
+M: reader-monad return drop '[ drop _ ] reader ;

 M: reader-monad fail   "Fail" throw ;
 
 M: reader-monad fail   "Fail" throw ;
 

-M: reader >>= '[ , swap '[ dup , mcall @ mcall ] reader ] ;
+M: reader >>= '[ _ swap '[ dup _ mcall @ mcall ] reader ] ;

 
 : run-reader ( reader env -- ) swap mcall ;
 
 : ask ( -- reader ) [ ] reader ;
 
 : run-reader ( reader env -- ) swap mcall ;
 
 : ask ( -- reader ) [ ] reader ;

-: local ( reader quot -- reader' ) swap '[ @ , mcall ] reader ;
+: local ( reader quot -- reader' ) swap '[ @ _ mcall ] reader ;

 
 ! Writer
 SINGLETON: writer-monad
 
 ! Writer
 SINGLETON: writer-monad


@@ -185,7 +185,7 @@ M: writer-monad fail   "Fail" throw ;
 
 : run-writer ( writer -- value log ) [ value>> ] [ log>> ] bi ;
 
 
 : run-writer ( writer -- value log ) [ value>> ] [ log>> ] bi ;
 

-M: writer >>= '[ [ , run-writer ] dip '[ @ run-writer ] dip append writer ] ;
+M: writer >>= '[ [ _ run-writer ] dip '[ @ run-writer ] dip append writer ] ;

 
 : pass ( writer -- writer' ) run-writer [ first2 ] dip swap call writer ;
 : listen ( writer -- writer' ) run-writer [ 2array ] keep writer ;
 
 : pass ( writer -- writer' ) run-writer [ first2 ] dip swap call writer ;
 : listen ( writer -- writer' ) run-writer [ 2array ] keep writer ;

diff --git a/extra/money/money.factor b/extra/money/money.factor
index fb743e15af24568ffc4fe9ee1b43175d85e57430..76bc2bae182de333ad6d1f1d3b2c4f4aa6b5b4d9 100644 (file)
--- a/extra/money/money.factor
+++ b/extra/money/money.factor
@@ -1,5 +1,5 @@
 USING: io kernel math math.functions math.parser parser lexer
 USING: io kernel math math.functions math.parser parser lexer

-namespaces sequences splitting grouping combinators
+namespaces make sequences splitting grouping combinators

 continuations sequences.lib ;
 IN: money
 
 continuations sequences.lib ;
 IN: money
 

diff --git a/extra/morse/morse.factor b/extra/morse/morse.factor
index 4cce93a5a12b88aabe671873520823eb3995a1c7..2951c96077e425f740ed534b84a95877d65099d8 100644 (file)
--- a/extra/morse/morse.factor
+++ b/extra/morse/morse.factor
@@ -1,6 +1,8 @@
 ! Copyright (C) 2007, 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007, 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors assocs combinators hashtables kernel lists math namespaces openal parser-combinators promises sequences strings symbols synth synth.buffers unicode.case ;
+USING: accessors assocs combinators hashtables kernel lists math
+namespaces make openal parser-combinators promises sequences
+strings symbols synth synth.buffers unicode.case ;

 IN: morse
 
 <PRIVATE
 IN: morse
 
 <PRIVATE

diff --git a/extra/multi-methods/multi-methods.factor b/extra/multi-methods/multi-methods.factor
index a8025828f1fb6d876d6809e701f09ee18ec9dbea..682abf3a5d0d9342c2415005f2dee93c6b7472f4 100755 (executable)
--- a/extra/multi-methods/multi-methods.factor
+++ b/extra/multi-methods/multi-methods.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math sequences vectors classes classes.algebra
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math sequences vectors classes classes.algebra

-combinators arrays words assocs parser namespaces definitions
-prettyprint prettyprint.backend quotations generalizations
-debugger io compiler.units kernel.private effects accessors
-hashtables sorting shuffle math.order sets ;
+combinators arrays words assocs parser namespaces make
+definitions prettyprint prettyprint.backend quotations
+generalizations debugger io compiler.units kernel.private
+effects accessors hashtables sorting shuffle math.order sets ;

 IN: multi-methods
 
 ! PART I: Converting hook specializers
 IN: multi-methods
 
 ! PART I: Converting hook specializers

diff --git a/extra/odbc/odbc.factor b/extra/odbc/odbc.factor
index faa6c4835470d5141d9b5009d23cb0d3939c0fed..267c7be312d6640e401a269758b3f183927f1614 100644 (file)
--- a/extra/odbc/odbc.factor
+++ b/extra/odbc/odbc.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel alien alien.strings alien.syntax
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel alien alien.strings alien.syntax

-combinators alien.c-types strings sequences namespaces words
-math threads io.encodings.ascii ;
+combinators alien.c-types strings sequences namespaces make
+words math threads io.encodings.ascii ;

 IN: odbc
 
 << "odbc" "odbc32.dll" "stdcall" add-library >>
 IN: odbc
 
 << "odbc" "odbc32.dll" "stdcall" add-library >>

diff --git a/extra/opengl/capabilities/capabilities.factor b/extra/opengl/capabilities/capabilities.factor
index 806935d5c9c9bc78197c7aaab124654b6caf7382..3972fea7b34487278825858afda8a55a35817a33 100755 (executable)
--- a/extra/opengl/capabilities/capabilities.factor
+++ b/extra/opengl/capabilities/capabilities.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel namespaces sequences splitting opengl.gl
+USING: kernel namespaces make sequences splitting opengl.gl

 continuations math.parser math arrays sets math.order ;
 IN: opengl.capabilities
 
 continuations math.parser math arrays sets math.order ;
 IN: opengl.capabilities
 

diff --git a/extra/ori/ori.factor b/extra/ori/ori.factor
index de720a229fa05d69b4d058c32c1e96c8c7e4171d..84d33bb77fdf960d15215143978c7f082e04dd6d 100644 (file)
--- a/extra/ori/ori.factor
+++ b/extra/ori/ori.factor
@@ -1,5 +1,5 @@
 
 

-USING: kernel namespaces accessors
+USING: kernel namespaces make accessors

        math math.constants math.functions math.matrices math.vectors
        sequences splitting grouping self math.trig ;
 
        math math.constants math.functions math.matrices math.vectors
        sequences splitting grouping self math.trig ;
 

diff --git a/extra/pack/pack.factor b/extra/pack/pack.factor
index a5d4b36c0b651cf17f926960a148e3c982749314..889eecb49a4deb30074b72bf272395936f6740d0 100755 (executable)
--- a/extra/pack/pack.factor
+++ b/extra/pack/pack.factor
@@ -1,7 +1,7 @@
 USING: alien alien.c-types arrays assocs byte-arrays io
 io.binary io.streams.string kernel math math.parser namespaces
 USING: alien alien.c-types arrays assocs byte-arrays io
 io.binary io.streams.string kernel math math.parser namespaces

-parser prettyprint quotations sequences strings vectors words
-macros math.functions math.bitwise ;
+make parser prettyprint quotations sequences strings vectors
+words macros math.functions math.bitwise ;

 IN: pack
 
 SYMBOL: big-endian
 IN: pack
 
 SYMBOL: big-endian

diff --git a/extra/processing/processing.factor b/extra/processing/processing.factor
index 07b92fa8fd175fba4110fc2c975803d57efbfb34..f351c989f071751d8ede61cf5e56f0c41f6517c1 100644 (file)
--- a/extra/processing/processing.factor
+++ b/extra/processing/processing.factor
@@ -8,7 +8,7 @@ USING: kernel namespaces threads combinators sequences arrays
        combinators
        combinators.lib
        combinators.cleave
        combinators
        combinators.lib
        combinators.cleave

-       rewrite-closures fry accessors newfx
+       rewrite-closures bake bake.fry accessors newfx

        processing.gadget math.geometry.rect
        processing.shapes
        colors ;
        processing.gadget math.geometry.rect
        processing.shapes
        colors ;

diff --git a/extra/project-euler/009/009.factor b/extra/project-euler/009/009.factor
index 690fed9012eba2be2142849ea91bbf6a6da9c4e1..c1a4a169189b0a0aa74cf893e233e433b289d0b8 100644 (file)
--- a/extra/project-euler/009/009.factor
+++ b/extra/project-euler/009/009.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel math math.functions namespaces sequences sorting ;
+USING: kernel math math.functions namespaces make sequences sorting ;

 IN: project-euler.009
 
 ! http://projecteuler.net/index.php?section=problems&id=9
 IN: project-euler.009
 
 ! http://projecteuler.net/index.php?section=problems&id=9

diff --git a/extra/project-euler/011/011.factor b/extra/project-euler/011/011.factor
index a55c3ac1242a849874dd9a801ee8e88361137a46..f4e549c7c046cb1b48b03d9f5b84d1919e5b360d 100644 (file)
--- a/extra/project-euler/011/011.factor
+++ b/extra/project-euler/011/011.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel namespaces project-euler.common sequences
+USING: kernel namespaces make project-euler.common sequences

 splitting grouping ;
 IN: project-euler.011
 
 splitting grouping ;
 IN: project-euler.011
 

diff --git a/extra/project-euler/014/014.factor b/extra/project-euler/014/014.factor
index 4f17e855b77b5a7af888f42bcc707af2b32c69f1..fcbc956de8a305da43e270f9cd747f7748edc19c 100644 (file)
--- a/extra/project-euler/014/014.factor
+++ b/extra/project-euler/014/014.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays combinators.lib combinators.short-circuit kernel math math.ranges
-    namespaces sequences sorting ;
+USING: arrays combinators.lib combinators.short-circuit kernel
+math math.ranges namespaces make sequences sorting ;

 IN: project-euler.014
 
 ! http://projecteuler.net/index.php?section=problems&id=14
 IN: project-euler.014
 
 ! http://projecteuler.net/index.php?section=problems&id=14

diff --git a/extra/project-euler/042/042.factor b/extra/project-euler/042/042.factor
index 4111fe80091555644b38941deaf45164624e83ed..da26e3492772b990e27993ea08f4b687ac111c4b 100644 (file)
--- a/extra/project-euler/042/042.factor
+++ b/extra/project-euler/042/042.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: ascii io.files kernel math math.functions namespaces
+USING: ascii io.files kernel math math.functions namespaces make

     project-euler.common sequences sequences.lib splitting io.encodings.ascii ;
 IN: project-euler.042
 
     project-euler.common sequences sequences.lib splitting io.encodings.ascii ;
 IN: project-euler.042
 

diff --git a/extra/project-euler/059/059.factor b/extra/project-euler/059/059.factor
index aa2cdb75b0000179ee876e71ee652a1e6cfdfd94..f209b50a467ca73ee83438e5460a5a4223ec66ab 100644 (file)
--- a/extra/project-euler/059/059.factor
+++ b/extra/project-euler/059/059.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays ascii assocs hashtables io.encodings.ascii io.files kernel math
 ! Copyright (c) 2008 Aaron Schaefer, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays ascii assocs hashtables io.encodings.ascii io.files kernel math

-    math.parser namespaces sequences sequences.lib sequences.private sorting
+    math.parser namespaces make sequences sequences.lib sequences.private sorting

     splitting grouping strings sets accessors ;
 IN: project-euler.059
 
     splitting grouping strings sets accessors ;
 IN: project-euler.059
 

diff --git a/extra/project-euler/079/079.factor b/extra/project-euler/079/079.factor
index 1e6a2fb0b477be3526e97cb8b91db01f0dbd6295..99c70ba038e377e0522ed479691c68d4a26f74a9 100644 (file)
--- a/extra/project-euler/079/079.factor
+++ b/extra/project-euler/079/079.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: assocs hashtables io.files kernel math math.parser namespaces
-io.encodings.ascii sequences sets ;
+USING: assocs hashtables io.files kernel math math.parser
+namespaces make io.encodings.ascii sequences sets ;

 IN: project-euler.079
 
 ! http://projecteuler.net/index.php?section=problems&id=79
 IN: project-euler.079
 
 ! http://projecteuler.net/index.php?section=problems&id=79

diff --git a/extra/project-euler/ave-time/ave-time.factor b/extra/project-euler/ave-time/ave-time.factor
index be39b26a97ea5f68857dfd710880b98442896fd5..df96d5e21105cede7807d470d2eb6bfbc097cb16 100644 (file)
--- a/extra/project-euler/ave-time/ave-time.factor
+++ b/extra/project-euler/ave-time/ave-time.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: continuations io kernel math math.functions math.parser math.statistics
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: continuations io kernel math math.functions math.parser math.statistics

-    namespaces tools.time ;
+    namespaces make tools.time ;

 IN: project-euler.ave-time
 
 : collect-benchmarks ( quot n -- seq )
 IN: project-euler.ave-time
 
 : collect-benchmarks ( quot n -- seq )

diff --git a/extra/project-euler/common/common.factor b/extra/project-euler/common/common.factor
index 7963cde25497d0c2caed48612eb4b97d53f87d86..094893616b50386b83bc99f960a626fc95592b17 100644 (file)
--- a/extra/project-euler/common/common.factor
+++ b/extra/project-euler/common/common.factor
@@ -1,6 +1,7 @@
-USING: arrays kernel math math.functions math.miller-rabin math.matrices
-    math.order math.parser math.primes.factors math.ranges namespaces
-    sequences sequences.lib sorting unicode.case ;
+USING: arrays kernel math math.functions math.miller-rabin
+math.matrices math.order math.parser math.primes.factors
+math.ranges namespaces make sequences sequences.lib sorting
+unicode.case ;

 IN: project-euler.common
 
 ! A collection of words used by more than one Project Euler solution
 IN: project-euler.common
 
 ! A collection of words used by more than one Project Euler solution

diff --git a/extra/promises/promises.factor b/extra/promises/promises.factor
index 5d63406e78db4172cd592d08b2f81a6a9698d082..38366697eac977c1d71291968d5ab0d725164342 100755 (executable)
--- a/extra/promises/promises.factor
+++ b/extra/promises/promises.factor
@@ -5,7 +5,7 @@
 ! Updated by Chris Double, September 2006
 
 USING: arrays kernel sequences math vectors arrays namespaces
 ! Updated by Chris Double, September 2006
 
 USING: arrays kernel sequences math vectors arrays namespaces

-quotations parser effects stack-checker words accessors ;
+make quotations parser effects stack-checker words accessors ;

 IN: promises
 
 TUPLE: promise quot forced? value ;
 IN: promises
 
 TUPLE: promise quot forced? value ;

diff --git a/extra/random-weighted/random-weighted.factor b/extra/random-weighted/random-weighted.factor
index 3f7a5d09b58cc0590830c1b0d09a023d2ee63fbc..ce3bc311be3d0e06cbc449cfa77bd6f437fe42c8 100644 (file)
--- a/extra/random-weighted/random-weighted.factor
+++ b/extra/random-weighted/random-weighted.factor
@@ -1,6 +1,6 @@
 
 USING: kernel namespaces arrays quotations sequences assocs combinators
 
 USING: kernel namespaces arrays quotations sequences assocs combinators

-       mirrors math math.vectors random macros fry ;
+       mirrors math math.vectors random macros bake bake.fry ;

 
 IN: random-weighted
 
 
 IN: random-weighted
 

diff --git a/extra/regexp/regexp.factor b/extra/regexp/regexp.factor
index cd2d0790abf3578f95d50c1618d5c64ef2c426ea..5ef3eacc6c19251e6a62f205adce9df468dbb3c6 100755 (executable)
--- a/extra/regexp/regexp.factor
+++ b/extra/regexp/regexp.factor
@@ -2,8 +2,7 @@ USING: arrays combinators kernel lists math math.parser
 namespaces parser lexer parser-combinators parser-combinators.simple
 promises quotations sequences combinators.lib strings math.order
 assocs prettyprint.backend memoize unicode.case unicode.categories
 namespaces parser lexer parser-combinators parser-combinators.simple
 promises quotations sequences combinators.lib strings math.order
 assocs prettyprint.backend memoize unicode.case unicode.categories

-combinators.short-circuit accessors ;
-USE: io
+combinators.short-circuit accessors make io ;

 IN: regexp
 
 <PRIVATE
 IN: regexp
 
 <PRIVATE

diff --git a/extra/rewrite-closures/rewrite-closures.factor b/extra/rewrite-closures/rewrite-closures.factor
index 198e1744bca2cf4253d349fc3c51fec9c1f5d4d3..6d11c9d41c7ee4df3dbb18b60cf891b21df37c99 100644 (file)
--- a/extra/rewrite-closures/rewrite-closures.factor
+++ b/extra/rewrite-closures/rewrite-closures.factor
@@ -1,5 +1,6 @@
 
 

-USING: kernel parser math quotations namespaces sequences macros fry ;
+USING: kernel parser math quotations namespaces sequences macros
+bake bake.fry ;

 
 IN: rewrite-closures
 
 
 IN: rewrite-closures
 

diff --git a/extra/roman/roman.factor b/extra/roman/roman.factor
index aefe86328d174aadec413a0693ed84e40f672ee1..dcadb865f9687815626d0815c550062c15f8c189 100644 (file)
--- a/extra/roman/roman.factor
+++ b/extra/roman/roman.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2007 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: arrays assocs kernel math math.order math.vectors namespaces
-quotations sequences sequences.lib sequences.private strings unicode.case ;
+USING: arrays assocs kernel math math.order math.vectors
+namespaces make quotations sequences sequences.lib
+sequences.private strings unicode.case ;

 IN: roman
 
 <PRIVATE
 IN: roman
 
 <PRIVATE

diff --git a/extra/sequences/lib/lib.factor b/extra/sequences/lib/lib.factor
index 225b3b7d9ed84dc6fed4eb25245dacff2c9fc6f3..ba49b8ee9e3bb01be4225be34171e741e65e58e9 100755 (executable)
--- a/extra/sequences/lib/lib.factor
+++ b/extra/sequences/lib/lib.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2007 Slava Pestov, Chris Double, Doug Coleman,
 !                    Eduardo Cavazos, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007 Slava Pestov, Chris Double, Doug Coleman,
 !                    Eduardo Cavazos, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: combinators.lib kernel sequences math namespaces assocs 
-random sequences.private shuffle math.functions
-arrays math.parser math.private sorting strings ascii macros
-assocs.lib quotations hashtables math.order locals
-generalizations ;
+USING: combinators.lib kernel sequences math namespaces make
+assocs random sequences.private shuffle math.functions arrays
+math.parser math.private sorting strings ascii macros assocs.lib
+quotations hashtables math.order locals generalizations ;

 IN: sequences.lib
 
 : each-withn ( seq quot n -- ) nwith each ; inline
 IN: sequences.lib
 
 : each-withn ( seq quot n -- ) nwith each ; inline

diff --git a/extra/state-machine/state-machine.factor b/extra/state-machine/state-machine.factor
index 6a785e91b7a0fd7a61620debb1d3372092dc5dbb..37e12a6993eb67a8d96d3368c8ef2d2a6fcefb1c 100755 (executable)
--- a/extra/state-machine/state-machine.factor
+++ b/extra/state-machine/state-machine.factor
@@ -1,4 +1,4 @@
-USING: kernel parser lexer strings math namespaces
+USING: kernel parser lexer strings math namespaces make

 sequences words io arrays quotations debugger accessors
 sequences.private ;
 IN: state-machine
 sequences words io arrays quotations debugger accessors
 sequences.private ;
 IN: state-machine

diff --git a/extra/state-tables/state-tables.factor b/extra/state-tables/state-tables.factor
index 9a04a5b74a05d738524433a10c96300793dab6d7..ecb258c1637376ae0d28157776f47b2218a7c941 100644 (file)
--- a/extra/state-tables/state-tables.factor
+++ b/extra/state-tables/state-tables.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel namespaces sequences vectors assocs accessors ;
+USING: kernel namespaces make sequences vectors assocs accessors ;

 IN: state-tables
 
 TUPLE: table rows columns start-state final-states ;
 IN: state-tables
 
 TUPLE: table rows columns start-state final-states ;

diff --git a/extra/synth/example/example.factor b/extra/synth/example/example.factor
index 3357c103ad8a84053e3c128bd31532c1419ed903..747cfb9c8647bf6fe73b071130ded44b10cdc859 100644 (file)
--- a/extra/synth/example/example.factor
+++ b/extra/synth/example/example.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors arrays kernel namespaces openal sequences synth synth.buffers ;
+USING: accessors arrays kernel namespaces make openal sequences
+synth synth.buffers ;

 IN: synth.example
 
 : play-sine-wave ( freq seconds sample-freq -- )
 IN: synth.example
 
 : play-sine-wave ( freq seconds sample-freq -- )

diff --git a/extra/ui/gadgets/tabs/tabs.factor b/extra/ui/gadgets/tabs/tabs.factor
index 83ed445593f73ae93416623034eeb174a0719e0d..7e09d086c2154d1a27f17ffa89bc00484eacc8b4 100755 (executable)
--- a/extra/ui/gadgets/tabs/tabs.factor
+++ b/extra/ui/gadgets/tabs/tabs.factor
@@ -14,7 +14,7 @@ DEFER: (del-page)
 \r
 :: add-toggle ( model n name toggler -- )\r
   <frame>\r
 \r
 :: add-toggle ( model n name toggler -- )\r
   <frame>\r

-    n name toggler parent>> '[ , , , (del-page) ] "X" swap <bevel-button>\r
+    n name toggler parent>> '[ _ _ _ (del-page) ] "X" swap <bevel-button>\r

       @right grid-add\r
     n model name <toggle-button> @center grid-add\r
   toggler swap add-gadget drop ;\r
       @right grid-add\r
     n model name <toggle-button> @center grid-add\r
   toggler swap add-gadget drop ;\r


@@ -23,7 +23,7 @@ DEFER: (del-page)
      [ names>> ] [ model>> ] [ toggler>> ] tri\r
      [ clear-gadget ] keep\r
      [ [ length ] keep ] 2dip\r
      [ names>> ] [ model>> ] [ toggler>> ] tri\r
      [ clear-gadget ] keep\r
      [ [ length ] keep ] 2dip\r

-     '[ [ , ] 2dip , add-toggle ] 2each ;\r
+     '[ [ _ ] 2dip _ add-toggle ] 2each ;\r

 \r
 : refresh-book ( tabbed -- )\r
     model>> [ ] change-model ;\r
 \r
 : refresh-book ( tabbed -- )\r
     model>> [ ] change-model ;\r

diff --git a/extra/ui/gadgets/tiling/tiling.factor b/extra/ui/gadgets/tiling/tiling.factor
index 2d096966af5b642ced4913bbee667c60e79f815e..cf6ea7f48e6d6612c2d47482e6ee36dc9b6f89f2 100644 (file)
--- a/extra/ui/gadgets/tiling/tiling.factor
+++ b/extra/ui/gadgets/tiling/tiling.factor
@@ -1,7 +1,7 @@
 
 USING: kernel sequences math math.order
        ui.gadgets ui.gadgets.tracks ui.gestures
 
 USING: kernel sequences math math.order
        ui.gadgets ui.gadgets.tracks ui.gestures

-       fry accessors ;
+       bake.fry accessors ;

 
 IN: ui.gadgets.tiling
 
 
 IN: ui.gadgets.tiling
 


@@ -93,7 +93,7 @@ TUPLE: tiling < track gadgets tiles first focused ;
 
 : exchanged! ( seq a b -- )
                    [ 0 max ] bi@
 
 : exchanged! ( seq a b -- )
                    [ 0 max ] bi@

-  pick length 1 - '[ , min ] bi@
+  pick length 1 - '[ _ min ] bi@

   rot exchange ;
 
 : move-prev ( tiling -- tiling )
   rot exchange ;
 
 : move-prev ( tiling -- tiling )

diff --git a/extra/webapps/counter/counter.factor b/extra/webapps/counter/counter.factor
index a14d6d98235b1bfc212d872e1f76988dfd15597c..f3efb3868f2e231893e6f5a3273294b7b9944c68 100644 (file)
--- a/extra/webapps/counter/counter.factor
+++ b/extra/webapps/counter/counter.factor
@@ -13,7 +13,7 @@ M: counter-app init-session* drop 0 count sset ;
 : <counter-action> ( quot -- action )
     <action>
         swap '[
 : <counter-action> ( quot -- action )
     <action>
         swap '[

-            count , schange
+            count _ schange

             URL" $counter-app" <redirect>
         ] >>submit ;
 
             URL" $counter-app" <redirect>
         ] >>submit ;
 

diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor
index 10e706598e08c2be776f9edcc4f014b38cee7587..721529de27b35224a5cf310a1ec6f35a902918b3 100755 (executable)
--- a/extra/webapps/planet/planet.factor
+++ b/extra/webapps/planet/planet.factor
@@ -96,7 +96,7 @@ posting "POSTINGS"
 
 : fetch-blogroll ( blogroll -- entries )
     [ [ feed-url>> fetch-feed ] parallel-map ] [ [ name>> ] map ] bi
 
 : fetch-blogroll ( blogroll -- entries )
     [ [ feed-url>> fetch-feed ] parallel-map ] [ [ name>> ] map ] bi

-    [ '[ , <posting> ] map ] 2map concat ;
+    [ '[ _ <posting> ] map ] 2map concat ;

 
 : sort-entries ( entries -- entries' )
     [ [ date>> ] compare invert-comparison ] sort ;
 
 : sort-entries ( entries -- entries' )
     [ [ date>> ] compare invert-comparison ] sort ;


@@ -201,4 +201,4 @@ posting "POSTINGS"
         { planet "planet-common" } >>template ;
 
 : start-update-task ( db params -- )
         { planet "planet-common" } >>template ;
 
 : start-update-task ( db params -- )

-    '[ , , [ update-cached-postings ] with-db ] 10 minutes every drop ;
+    '[ _ _ [ update-cached-postings ] with-db ] 10 minutes every drop ;

diff --git a/extra/webapps/wee-url/wee-url.factor b/extra/webapps/wee-url/wee-url.factor
index 27187c4352e30f638866921243d7a7bf1e013fcb..e4a4a6a853939457e5388783cd4be90b6174e332 100644 (file)
--- a/extra/webapps/wee-url/wee-url.factor
+++ b/extra/webapps/wee-url/wee-url.factor
@@ -26,7 +26,7 @@ short-url "SHORT_URLS" {
     1 6 [a,b] random [ letter-bank random ] "" replicate-as ;
 
 : insert-short-url ( short-url -- short-url )
     1 6 [a,b] random [ letter-bank random ] "" replicate-as ;
 
 : insert-short-url ( short-url -- short-url )

-    '[ , dup random-url >>short insert-tuple ] 10 retry ;
+    '[ _ dup random-url >>short insert-tuple ] 10 retry ;

 
 : shorten ( url -- short )
     short-url new swap >>url dup select-tuple
 
 : shorten ( url -- short )
     short-url new swap >>url dup select-tuple

diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor
index f36e8a11f0eb15636b82d2fa93da5be24f37d559..9d1ad15aa4a0b592aee9b4d3394d4be92c8de51a 100644 (file)
--- a/extra/webapps/wiki/wiki.factor
+++ b/extra/webapps/wiki/wiki.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel hashtables calendar random assocs
 ! Copyright (C) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel hashtables calendar random assocs

-namespaces splitting sequences sorting math.order present
+namespaces make splitting sequences sorting math.order present

 io.files io.encodings.ascii
 syndication farkup
 html.components html.forms
 io.files io.encodings.ascii
 syndication farkup
 html.components html.forms

diff --git a/extra/wordtimer/wordtimer.factor b/extra/wordtimer/wordtimer.factor
index 5dc65c661b708962ac11c631e3836055000f7045..ae3ce224149b93731209b794543368f2a9cab735 100644 (file)
--- a/extra/wordtimer/wordtimer.factor
+++ b/extra/wordtimer/wordtimer.factor
@@ -1,4 +1,6 @@
-USING: kernel sequences namespaces math assocs words arrays tools.annotations vocabs sorting prettyprint io micros math.statistics accessors ;
+USING: kernel sequences namespaces make math assocs words arrays
+tools.annotations vocabs sorting prettyprint io micros
+math.statistics accessors ;

 IN: wordtimer
 
 SYMBOL: *wordtimes*
 IN: wordtimer
 
 SYMBOL: *wordtimes*

diff --git a/extra/xml/syntax/syntax.factor b/extra/xml/syntax/syntax.factor
index 6b765461e579c2b33128e85823fe3e797993f292..91b31ec7e64641f5e30f39046b5d0cb069173329 100644 (file)
--- a/extra/xml/syntax/syntax.factor
+++ b/extra/xml/syntax/syntax.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: lexer parser splitting kernel quotations namespaces
+USING: lexer parser splitting kernel quotations namespaces make

 sequences assocs sequences.lib xml.generator xml.utilities
 xml.data ;
 IN: xml.syntax
 sequences assocs sequences.lib xml.generator xml.utilities
 xml.data ;
 IN: xml.syntax