basis/extra: removing '[ @ ] in favor of _ for fried quotations.

diff --git a/basis/combinators/smart/smart.factor b/basis/combinators/smart/smart.factor
index 9102cfbc0281bf60e33cb0db1fb9794863d933d5..60dfd714ecbca20ff6769cd367c40ac314500396 100644 (file)
--- a/basis/combinators/smart/smart.factor
+++ b/basis/combinators/smart/smart.factor
@@ -139,7 +139,7 @@ MACRO: map-reduce-outputs ( quot mapper reducer -- quot )
 
 MACRO: smart-reduce ( reduce-quots -- quot )
     unzip [ [ ] like ] bi@ dup length dup '[
-        [ @ ] dip [ @ _ cleave-curry _ spread* ] each
+        _ dip [ @ _ cleave-curry _ spread* ] each
     ] ;
 
 MACRO: smart-map-reduce ( map-reduce-quots -- quot )
@@ -151,7 +151,7 @@ MACRO: smart-map-reduce ( map-reduce-quots -- quot )
 
 MACRO: smart-2reduce ( 2reduce-quots -- quot )
     unzip [ [ ] like ] bi@ dup length dup '[
-        [ @ ] 2dip
+        _ 2dip
         [ @ _ [ cleave-curry ] [ cleave-curry ] bi _ spread* ] 2each
     ] ;
 

diff --git a/basis/compiler/cfg/intrinsics/simd/backend/backend.factor b/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
index 41c330f201386203acf2d2c8a3eda3022b4e3fc1..bcf0df46b4fc6801070ea169001e1b52af3ba86f 100644 (file)
--- a/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
+++ b/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
@@ -70,7 +70,7 @@ M: ##horizontal-shl-vector-imm insn-available? rep>> %horizontal-shl-vector-imm-
 M: ##horizontal-shr-vector-imm insn-available? rep>> %horizontal-shr-vector-imm-reps member? ;
 
 : [vector-op-checked] ( #dup quot -- quot )
-    '[ _ ndup [ @ ] { } make dup [ insn-available? ] all? ] ;
+    '[ _ ndup _ { } make dup [ insn-available? ] all? ] ;
 
 GENERIC#: >vector-op-cond 2 ( quot #pick #dup -- quotpair )
 M:: callable >vector-op-cond ( quot #pick #dup -- quotpair )

diff --git a/basis/compiler/cfg/linear-scan/assignment/assignment.factor b/basis/compiler/cfg/linear-scan/assignment/assignment.factor
index 1ce2dd3dbed241b954bc4ae5dae671eacd418847..345d11b567522b079caa6a1d5af884c7eca2473e 100644 (file)
--- a/basis/compiler/cfg/linear-scan/assignment/assignment.factor
+++ b/basis/compiler/cfg/linear-scan/assignment/assignment.factor
@@ -103,7 +103,7 @@ RENAMING: assign [ vreg>reg ] [ vreg>reg ] [ vreg>reg ]
 
 : change-insn-gc-roots ( gc-map-insn quot: ( x -- x ) -- )
     [ gc-map>> ] dip [ swap gc-roots>> swap map! drop ]
-    [ '[ [ [ @ ] bi@ ] assoc-map ] change-derived-roots drop ] 2bi ; inline
+    [ '[ [ _ bi@ ] assoc-map ] change-derived-roots drop ] 2bi ; inline
 
 : spill-required? ( live-interval root-leaders n -- ? )
     [ [ vreg>> ] dip sets:in? ] [ swap covers? ] bi-curry* bi or ;

diff --git a/basis/compiler/tree/propagation/transforms/transforms.factor b/basis/compiler/tree/propagation/transforms/transforms.factor
index 75f9de07e39898e557ca259d084fce7b6f31d603..70d31049c4e59f806bafe8cb1686c1c3207ecf24 100644 (file)
--- a/basis/compiler/tree/propagation/transforms/transforms.factor
+++ b/basis/compiler/tree/propagation/transforms/transforms.factor
@@ -300,7 +300,7 @@ CONSTANT: lookup-table-at-max 256
 \ at* [ at-quot ] 1 define-partial-eval
 
 : diff-quot ( seq -- quot: ( seq' -- seq'' ) )
-    [ tester ] keep '[ members [ @ ] reject _ set-like ] ;
+    [ tester ] keep '[ members _ reject _ set-like ] ;
 
 M\ sets:set diff [ diff-quot ] 1 define-partial-eval
 

diff --git a/basis/math/functions/functions.factor b/basis/math/functions/functions.factor
index ab19faf078115ea87ad868545c89f0fad65ea075..010420a66ff05ba5c8b120dfe53807a42ddb5a9d 100644 (file)
--- a/basis/math/functions/functions.factor
+++ b/basis/math/functions/functions.factor
@@ -214,7 +214,7 @@ CONSTANT: log10-2 0x1.34413509f79ffp-2
 : (bignum-log) ( n log-quot: ( x -- y ) log-2 -- log )
     [ dup ] dip '[
         dup representable-as-float?
-        [ >float @ ] [ frexp [ @ ] [ _ * ] bi* + ] if
+        [ >float @ ] [ frexp _ [ _ * ] bi* + ] if
     ] call ; inline
 
 PRIVATE>

diff --git a/basis/math/matrices/matrices.factor b/basis/math/matrices/matrices.factor
index 55105965a594734cb726c0dac428235c521afe38..5eb5a6cde1ee9d3300b80310d3dacb2795742a93 100644 (file)
--- a/basis/math/matrices/matrices.factor
+++ b/basis/math/matrices/matrices.factor
@@ -237,7 +237,7 @@ M: sequence square-cols
     [ length ] keep [ <array> ] with { } map-as ;
 
 : make-matrix-with-indices ( m n quot -- matrix )
-    [ [ <iota> ] bi@ ] dip '[ @ ] cartesian-map ; inline
+    [ [ <iota> ] bi@ ] dip cartesian-map ; inline
 
 : null-matrix? ( matrix -- ? ) empty? ; inline
 

diff --git a/basis/pack/pack.factor b/basis/pack/pack.factor
index 80e54dfb6a21630aabf850caf08cfbdcb55f7949..3007d5cb8fb93ecfa4128e15491124201dfd7445 100644 (file)
--- a/basis/pack/pack.factor
+++ b/basis/pack/pack.factor
@@ -123,7 +123,7 @@ PRIVATE>
 MACRO: unpack ( str -- quot )
     expand-pack-format
     [ [ ch>packed-length ] { } map-as start/end ]
-    [ [ unpack-table at '[ @ ] ] { } map-as ] bi
+    [ [ unpack-table at ] { } map-as ] bi
     [ '[ [ _ _ ] dip <slice> @ ] ] 3map
     '[ [ _ cleave ] output>array ] ;
 

diff --git a/basis/stack-checker/values/values.factor b/basis/stack-checker/values/values.factor
index 43f054d90f550ff22414599e1634aab0f14a96fa..72a79a3f718de37746836d3e7c1dd664123f3964 100644 (file)
--- a/basis/stack-checker/values/values.factor
+++ b/basis/stack-checker/values/values.factor
@@ -122,7 +122,7 @@ M: f (literal) current-word get bad-macro-input ;
 GENERIC: known>callable ( known -- quot )
 
 : ?@ ( x -- y )
-    dup callable? [ drop [ @ ] ] unless ;
+    dup callable? [ drop _ ] unless ;
 
 M: object known>callable drop \ _ ;
 

diff --git a/extra/changer/changer.factor b/extra/changer/changer.factor
index 4f14da19091531f1cb38b902a23e533294f57437..48a8ea9dfff2277289cd825db79ec22cb704ec71 100644 (file)
--- a/extra/changer/changer.factor
+++ b/extra/changer/changer.factor
@@ -6,6 +6,6 @@ IN: changer
 MACRO: inline-changer ( name -- quot' )
     [ ">>" append ] [ ">>" prepend ] bi
     [ "accessors" lookup-word 1quotation ] bi@
-    '[ over [ [ @ ] dip call ] dip swap @ ] ;
+    '[ over [ _ dip call ] dip swap @ ] ;
 
 SYNTAX: change: scan-token '[ _ inline-changer ] append! ;

diff --git a/extra/io/random/random.factor b/extra/io/random/random.factor
index 6892158bb26392731269b6ee011bce63fe527261..dbb02edf2a7cf094d9cf6cbba0f7f1c52527a61c 100644 (file)
--- a/extra/io/random/random.factor
+++ b/extra/io/random/random.factor
@@ -9,7 +9,7 @@ IN: io.random
 <PRIVATE
 
 : each-numbered-line ( ... quot: ( ... line number -- ... ) -- ... )
-    [ 1 ] dip '[ swap [ @ ] [ 1 + ] bi ] each-line drop ; inline
+    [ 1 ] dip '[ swap _ [ 1 + ] bi ] each-line drop ; inline
 
 PRIVATE>
 

diff --git a/extra/libudev/libudev.factor b/extra/libudev/libudev.factor
index 6500a7015a5ea0888ecc0e24eadf5acb140de0ad..169c492745057d658d79ebd4ede38b098d73bf6f 100644 (file)
--- a/extra/libudev/libudev.factor
+++ b/extra/libudev/libudev.factor
@@ -95,7 +95,7 @@ FUNCTION: c-string udev_list_entry_get_value (
 
 ! Helper to iterate over all entries of a list.
 : udev_list_entry_foreach ( ... first_entry quot: ( ... x -- ... ) -- ... )
-    [ [ dup ] ] dip '[ [ @ ] keep udev_list_entry_get_next ]
+    [ [ dup ] ] dip '[ _ keep udev_list_entry_get_next ]
     while drop ; inline
 
 ! Get all list entries _as_ a list

diff --git a/extra/mongodb/operations/operations.factor b/extra/mongodb/operations/operations.factor
index 9cedd7bb4c2e6bedc9faac25a7a5fb279bf06546..7aaea3d6af37c48ce00d3dc30a1823f05e012dfb 100644 (file)
--- a/extra/mongodb/operations/operations.factor
+++ b/extra/mongodb/operations/operations.factor
@@ -84,7 +84,7 @@ PRIVATE>
 : (write-message) ( message quot -- )
     [ connection-buffer dup ] 2dip
     '[
-        [ _ [ write-header ] [ @ ] bi ] with-length-prefix
+        [ _ [ write-header ] _ bi ] with-length-prefix
     ] with-output-stream* write flush ; inline
 
 :: build-query-object ( query -- selector )

diff --git a/extra/tools/image-analyzer/utils/utils.factor b/extra/tools/image-analyzer/utils/utils.factor
index d59d0f962dbb0535ecc215c4536e3926a1011db3..981a7e4658aed756af2b7fa0975f8abb34af427e 100644 (file)
--- a/extra/tools/image-analyzer/utils/utils.factor
+++ b/extra/tools/image-analyzer/utils/utils.factor
@@ -23,7 +23,7 @@ IN: tools.image-analyzer.utils
 
 : until-eof-reader ( reader-quot -- reader-quot' )
     '[
-        [ [ @ ] throw-on-eof ] [
+        [ _ throw-on-eof ] [
             dup stream-exhausted? [ drop f ] [ throw ] if
         ] recover
     ] ; inline