core/basis: Rename tuples kernel:curry -> curried, kernel:compose -> composed.

[factor.git] / core / bootstrap / primitives.factor

diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index 4ba2cf5079ff5f5450be7d36b391c8f8d1db9903..c6bb5fd3e145f93c3defca1174764ca81102313a 100755 (executable)
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -278,49 +278,48 @@ slots>tuple 1quotation ( -- value ) define-inline
 slots>tuple 1quotation ( -- value ) define-inline
 
 ! Some tuple classes
-"curry" "kernel" create-word
+
+"curried" "kernel" create-word
 tuple
 {
     { "obj" read-only }
     { "quot" read-only }
 } prepare-slots define-tuple-class
 
-"curry" "kernel" lookup-word
+"curry" "kernel" create-word
 {
     [ f "inline" set-word-prop ]
     [ make-flushable ]
-    [ ]
-    [
-        [
-            callable instance-check-quot %
-            tuple-layout ,
-            \ <tuple-boa> ,
-        ] [ ] make
-    ]
 } cleave
+
+"curry" "kernel" lookup-word
+[
+    callable instance-check-quot %
+    "curried" "kernel" lookup-word tuple-layout ,
+    \ <tuple-boa> ,
+] [ ] make
 ( obj quot -- curry ) define-declared
 
-"compose" "kernel" create-word
+"composed" "kernel" create-word
 tuple
 {
     { "first" read-only }
     { "second" read-only }
 } prepare-slots define-tuple-class
 
-"compose" "kernel" lookup-word
+"compose" "kernel" create-word
 {
     [ f "inline" set-word-prop ]
     [ make-flushable ]
-    [ ]
-    [
-        [
-            callable instance-check-quot [ dip ] curry %
-            callable instance-check-quot %
-            tuple-layout ,
-            \ <tuple-boa> ,
-        ] [ ] make
-    ]
 } cleave
+
+"compose" "kernel" lookup-word
+[
+    callable instance-check-quot [ dip ] curry %
+    callable instance-check-quot %
+    "composed" "kernel" lookup-word tuple-layout ,
+    \ <tuple-boa> ,
+] [ ] make
 ( quot1 quot2 -- compose ) define-declared
 
 "* Declaring primitives..." print flush