factor: Rename [curry] -> currier, remove some [foo] words.

The [foo] convention is not descriptive and looks like special syntax.

diff --git a/basis/compiler/cfg/intrinsics/simd/backend/backend.factor b/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
index 89823fd15b4cf790895398fa133317cc38f2f007..1a267a38c6928090059a73425d56e043e17344f9 100644 (file)
--- a/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
+++ b/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
@@ -124,11 +124,11 @@ MACRO: if-literals-match ( quots -- quot )
         ] [ 2drop bad-simd-intrinsic ] if
     ] ;
 
-CONSTANT: [unary]        [ ds-drop  ds-pop ]
-CONSTANT: [unary/param]  [ [ -2 <ds-loc> inc-stack ds-pop ] dip ]
-CONSTANT: [binary]       [ ds-drop 2inputs ]
-CONSTANT: [binary/param] [ [ -2 <ds-loc> inc-stack 2inputs ] dip ]
-CONSTANT: [quaternary]
+CONSTANT: unary        [ ds-drop  ds-pop ]
+CONSTANT: unary/param  [ [ -2 <ds-loc> inc-stack ds-pop ] dip ]
+CONSTANT: binary       [ ds-drop 2inputs ]
+CONSTANT: binary/param [ [ -2 <ds-loc> inc-stack 2inputs ] dip ]
+CONSTANT: quaternary
     [
         ds-drop
         D: 3 peek-loc
@@ -138,20 +138,20 @@ CONSTANT: [quaternary]
         -4 <ds-loc> inc-stack
     ]
 
-:: [emit-vector-op] ( trials params-quot op-quot literal-preds -- quot )
+:: emit-vector-op ( trials params-quot op-quot literal-preds -- quot )
     params-quot trials op-quot literal-preds
     '[ [ _ dip _ @ ds-push ] _ if-literals-match ] ;
 
 MACRO: emit-v-vector-op ( trials -- quot )
-    [unary] [ v-vector-op ] { [ representation? ] } [emit-vector-op] ;
+    unary [ v-vector-op ] { [ representation? ] } emit-vector-op ;
 MACRO: emit-vl-vector-op ( trials literal-pred -- quot )
-    [ [unary/param] [ vl-vector-op ] { [ representation? ] } ] dip prefix [emit-vector-op] ;
+    [ unary/param [ vl-vector-op ] { [ representation? ] } ] dip prefix emit-vector-op ;
 MACRO: emit-vv-vector-op ( trials -- quot )
-    [binary] [ vv-vector-op ] { [ representation? ] } [emit-vector-op] ;
+    binary [ vv-vector-op ] { [ representation? ] } emit-vector-op ;
 MACRO: emit-vvl-vector-op ( trials literal-pred -- quot )
-    [ [binary/param] [ vvl-vector-op ] { [ representation? ] } ] dip prefix [emit-vector-op] ;
+    [ binary/param [ vvl-vector-op ] { [ representation? ] } ] dip prefix emit-vector-op ;
 MACRO: emit-vvvv-vector-op ( trials -- quot )
-    [quaternary] [ vvvv-vector-op ] { [ representation? ] } [emit-vector-op] ;
+    quaternary [ vvvv-vector-op ] { [ representation? ] } emit-vector-op ;
 
 MACRO:: emit-vv-or-vl-vector-op ( var-trials imm-trials literal-pred -- quot )
     literal-pred imm-trials literal-pred var-trials

diff --git a/basis/generalizations/generalizations.factor b/basis/generalizations/generalizations.factor
index 37d4733d255445c06094f64e83ec6c096ac367dd..b45ce527855ce058784ac453221b85fd02637b2d 100644 (file)
--- a/basis/generalizations/generalizations.factor
+++ b/basis/generalizations/generalizations.factor
@@ -110,13 +110,13 @@ MACRO: cleave* ( n -- quot )
     [ nip dupn ] [ nspread* ] 2bi ; inline
 
 : apply-curry ( a... quot n -- )
-    [ [curry] ] dip napply ; inline
+    [ currier ] dip napply ; inline
 
 : cleave-curry ( a quot... n -- )
-    [ [curry] ] swap [ napply ] [ cleave* ] bi ; inline
+    [ currier ] swap [ napply ] [ cleave* ] bi ; inline
 
 : spread-curry ( a... quot... n -- )
-    [ [curry] ] swap [ napply ] [ spread* ] bi ; inline
+    [ currier ] swap [ napply ] [ spread* ] bi ; inline
 
 MACRO: mnswap ( m n -- quot )
     1 + '[ _ -nrot ] swap '[ _ _ napply ] ;

diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index d5c7cfb231567cb51f1f8b99057a3a9acd01feb0..9bddf6bc6bacd5085bc972a62fb4a63a750bfa49 100644 (file)
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -196,21 +196,21 @@ DEFER: if
 ! Curried cleavers
 <PRIVATE
 
-: [curry] ( quot -- quot' ) [ curry ] curry ; inline
+: currier ( quot -- quot' ) [ curry ] curry ; inline
 
 PRIVATE>
 
-: bi-curry ( x p q -- p' q' ) [ [curry] ] bi@ bi ; inline
+: bi-curry ( x p q -- p' q' ) [ currier ] bi@ bi ; inline
 
-: tri-curry ( x p q r -- p' q' r' ) [ [curry] ] tri@ tri ; inline
+: tri-curry ( x p q r -- p' q' r' ) [ currier ] tri@ tri ; inline
 
-: bi-curry* ( x y p q -- p' q' ) [ [curry] ] bi@ bi* ; inline
+: bi-curry* ( x y p q -- p' q' ) [ currier ] bi@ bi* ; inline
 
-: tri-curry* ( x y z p q r -- p' q' r' ) [ [curry] ] tri@ tri* ; inline
+: tri-curry* ( x y z p q r -- p' q' r' ) [ currier ] tri@ tri* ; inline
 
-: bi-curry@ ( x y q -- p' q' ) [curry] bi@ ; inline
+: bi-curry@ ( x y q -- p' q' ) currier bi@ ; inline
 
-: tri-curry@ ( x y z q -- p' q' r' ) [curry] tri@ ; inline
+: tri-curry@ ( x y z q -- p' q' r' ) currier tri@ ; inline
 
 ! Booleans
 UNION: boolean POSTPONE: t POSTPONE: f ;