From 63487afa6786962e40e03743185a245684b82777 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <gerwitzm@lovullo.com>
Date: Wed, 26 Nov 2014 16:28:29 -0500
Subject: [PATCH] `f:apply' currying support

Partial application support on all the other `f:apply' functions (other
arities) will be completed in the next commit.
---
 src/apply.xsl    | 13 +++++++------
 test/apply.xspec | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/src/apply.xsl b/src/apply.xsl
index f7130b5..d96db5f 100644
--- a/src/apply.xsl
+++ b/src/apply.xsl
@@ -30,7 +30,7 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:f="http://www.lovullo.com/hoxsl/apply">
 
-<import href="apply/arity.xsl" />
+<import href="apply/partial.xsl" />
 
 
 <function name="f:apply">
@@ -40,18 +40,19 @@
 </function>
 
 
+<!-- WARNING: inconsistent state: only `f:apply#{1,2}' support partial
+     application at the moment -->
+
 <function name="f:apply">
-  <param name="fnref" as="element(f:ref)" />
+  <param name="fnref" as="item()+" />
   <param name="arg1" />
 
-  <apply-templates select="$fnref" mode="f:apply">
-    <with-param name="arg1" select="$arg1" />
-  </apply-templates>
+  <sequence select="f:partial( $fnref, $arg1 )" />
 </function>
 
 
 <function name="f:apply">
-  <param name="fnref" as="element(f:ref)" />
+  <param name="fnref" as="item()+" />
   <param name="arg1" />
   <param name="arg2" />
 
diff --git a/test/apply.xspec b/test/apply.xspec
index 920ca33..9262024 100644
--- a/test/apply.xspec
+++ b/test/apply.xspec
@@ -215,6 +215,54 @@
                       and $x:result[ 9 ] is $args/foo:arg8" />
       </scenario>
     </scenario>
+
+
+    <scenario label="applied to partial argument list">
+      <!-- while this looks comprehensive, this really only tests
+           f:apply#2 -->
+      <scenario label="supports currying">
+        <variable name="fn8"
+                  select="f:make-ref( QName( $foo-uri, 'fn8' ),
+                                      8 )" />
+
+        <call function="f:apply">
+          <!-- @, @ makin' you dizzy? -->
+          <param name="fnref"
+                 select="f:apply(
+                           f:apply(
+                             f:apply(
+                               f:apply(
+                                 f:apply(
+                                   f:apply(
+                                     f:apply(
+                                       $fn8,
+                                       $args/foo:arg1 ),
+                                     $args/foo:arg2 ),
+                                   $args/foo:arg3 ),
+                                 $args/foo:arg4 ),
+                               $args/foo:arg5 ),
+                             $args/foo:arg6 ),
+                           $args/foo:arg7 )" />
+
+          <!-- the final argument that will apply the unary
+               partially applied function to the target 8-ary -->
+          <param name="arg1"
+                 select="$args/foo:arg8" />
+        </call>
+
+        <expect label="applies target function and binds each
+                       argument in proper order"
+                test="$x:result[ 1 ] = foo:applied[ @n = 8 ]
+                      and $x:result[ 2 ] is $args/foo:arg1
+                      and $x:result[ 3 ] is $args/foo:arg2
+                      and $x:result[ 4 ] is $args/foo:arg3
+                      and $x:result[ 5 ] is $args/foo:arg4
+                      and $x:result[ 6 ] is $args/foo:arg5
+                      and $x:result[ 7 ] is $args/foo:arg6
+                      and $x:result[ 8 ] is $args/foo:arg7
+                      and $x:result[ 9 ] is $args/foo:arg8" />
+      </scenario>
+    </scenario>
   </scenario>