From 67eef761bb432e477c6d50fba3cc59570ca87f5f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 12 Feb 2009 04:14:05 -0600
Subject: [PATCH] kernel: cleanup

---
 core/kernel/kernel.factor | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index 9a6679eea8..cb0bdd4d73 100644
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -152,27 +152,17 @@ DEFER: if
     swap compose ; inline
 
 ! Curried cleavers
-<PRIVATE
+: bi-curry ( x p q -- p' q' ) [ [curry] ] bi@ bi ; inline
 
-: schönfinkel ( quot -- quot' ) [ curry ] curry ; inline
+: tri-curry ( x p q r -- p' q' r' ) [ [curry] ] tri@ tri ; inline
 
-: bi-schönfinkel ( p q -- p' q' ) [ schönfinkel ] bi@ ; inline
+: bi-curry* ( x y p q -- p' q' ) [ [curry] ] bi@ bi* ; inline
 
-: tri-schönfinkel ( p q r -- p' q' r' ) [ schönfinkel ] tri@ ; inline
+: tri-curry* ( x y z p q r -- p' q' r' ) [ [curry] ] tri@ tri* ; inline
 
-PRIVATE>
+: bi-curry@ ( x y q -- p' q' ) [curry] bi@ ; inline
 
-: bi-curry ( x p q -- p' q' ) bi-schönfinkel bi ; inline
-
-: tri-curry ( x p q r -- p' q' r' ) tri-schönfinkel tri ; inline
-
-: bi-curry* ( x y p q -- p' q' ) bi-schönfinkel bi* ; inline
-
-: tri-curry* ( x y z p q r -- p' q' r' ) tri-schönfinkel tri* ; inline
-
-: bi-curry@ ( x y q -- p' q' ) schönfinkel bi@ ; inline
-
-: tri-curry@ ( x y z q -- p' q' r' ) schönfinkel tri@ ; inline
+: tri-curry@ ( x y z q -- p' q' r' ) [curry] tri@ ; inline
 
 ! Booleans
 : not ( obj -- ? ) [ f ] [ t ] if ; inline