From b2d87c531837c04df5501d65ad67a56a689f3eb5 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <gerwitm@lovullo.com>
Date: Tue, 5 Jul 2016 23:57:59 -0400
Subject: [PATCH] Re-order graph:dep-lookup arguments to favor partial
 application

* src/graph.xsl (graph:dep-lookup): Re-order arguments
* test/graph.xspec: Updated accordingly
---
 src/graph.xsl    | 10 ++++++----
 test/graph.xspec | 39 ++++++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/graph.xsl b/src/graph.xsl
index 25fdad6f..7351cd76 100644
--- a/src/graph.xsl
+++ b/src/graph.xsl
@@ -223,11 +223,13 @@
 
   From a graph perspective,
     the dependencies are edges on the @var{$symbol} vertex.
+
+  Parameters are organized for partial application.
 -->
 <function name="graph:dep-lookup" as="element( preproc:sym-dep )?">
-  <param name="symbol" as="element( preproc:sym )" />
-  <param name="graph"  as="element( preproc:sym-deps )" />
   <param name="lookup" />
+  <param name="graph"  as="element( preproc:sym-deps )" />
+  <param name="symbol" as="element( preproc:sym )" />
 
   <variable name="deps" as="element( preproc:sym-dep )?"
             select="$graph/preproc:sym-dep
@@ -236,9 +238,9 @@
   <sequence select="if ( exists( $deps ) ) then
                         $deps
                       else if ( $lookup ) then
-                          graph:dep-lookup( $symbol,
+                          graph:dep-lookup( $lookup,
                                             f:apply( $lookup, $symbol ),
-                                            $lookup )
+                                            $symbol )
                         else
                           ()" />
 </function>
diff --git a/test/graph.xspec b/test/graph.xspec
index 209f9654..2b44b44a 100644
--- a/test/graph.xspec
+++ b/test/graph.xspec
@@ -192,13 +192,14 @@
       <scenario label="in the same package">
         <scenario label="where dependencies exist">
           <call function="graph:dep-lookup">
-            <param name="symbol"
-                   select="$foo:document/preproc:symtable
-                             /preproc:sym[ @name='local' ]" />
+            <param name="lookup" select="()" />
+
             <param name="graph"
                    select="$foo:document/preproc:sym-deps" />
 
-            <param name="lookup" select="()" />
+            <param name="symbol"
+                   select="$foo:document/preproc:symtable
+                             /preproc:sym[ @name='local' ]" />
           </call>
 
           <expect label="returns local dependencies"
@@ -210,13 +211,14 @@
 
         <scenario label="with external @src but local deps">
           <call function="graph:dep-lookup">
-            <param name="symbol"
-                   select="$foo:document/preproc:symtable
-                             /preproc:sym[ @name='external-but-not' ]" />
+            <param name="lookup" select="()" />
+
             <param name="graph"
                    select="$foo:document/preproc:sym-deps" />
 
-            <param name="lookup" select="()" />
+            <param name="symbol"
+                   select="$foo:document/preproc:symtable
+                             /preproc:sym[ @name='external-but-not' ]" />
           </call>
 
           <expect label="returns local dependencies"
@@ -228,13 +230,15 @@
 
         <scenario label="where dependencies are missing">
           <call function="graph:dep-lookup">
-            <param name="symbol"
-                   select="$foo:document/preproc:symtable
-                             /preproc:sym[ @name='missing-deps' ]" />
+            <param name="lookup" select="()" />
+
             <param name="graph"
                    select="$foo:document/preproc:sym-deps" />
 
-            <param name="lookup" select="()" />
+
+            <param name="symbol"
+                   select="$foo:document/preproc:symtable
+                             /preproc:sym[ @name='missing-deps' ]" />
           </call>
 
           <expect label="return empty sequence"
@@ -250,14 +254,15 @@
 
         <scenario label="where dependencies exist">
           <call function="graph:dep-lookup">
-            <param name="symbol"
-                   select="$foo:document/preproc:symtable
-                             /preproc:sym[ @name='external' ]" />
+            <param name="lookup"
+                   select="foo:lookup( $foo:expected-lookup )" />
+
             <param name="graph"
                    select="$foo:document/preproc:sym-deps" />
 
-            <param name="lookup"
-                   select="foo:lookup( $foo:expected-lookup )" />
+            <param name="symbol"
+                   select="$foo:document/preproc:symtable
+                             /preproc:sym[ @name='external' ]" />
           </call>
 
           <expect label="returns external dependenices"