From 658edd87170ea9b179c4067e2e593ffb0113264c Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <gerwitzm@lovullo.com>
Date: Thu, 4 Dec 2014 03:20:16 -0500
Subject: [PATCH] `f:set-args' respects and echoes adjacent data by references

Was previously clobbered.
---
 src/apply/ref.xsl    |  6 +++++-
 test/apply/ref.xspec | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/apply/ref.xsl b/src/apply/ref.xsl
index 62ea53e..602b39f 100644
--- a/src/apply/ref.xsl
+++ b/src/apply/ref.xsl
@@ -211,7 +211,11 @@
     <sequence select="$desc/*" />
   </f:ref>
 
-  <sequence select="$args" />
+  <!-- be sure to retain the adjacent data (which is offset by the
+       _original_ reference length) -->
+  <sequence select="$args,
+                    subsequence( $fnref,
+                                 $desc/@length + 1 )" />
 </function>
 
 
diff --git a/test/apply/ref.xspec b/test/apply/ref.xspec
index 9ab87bd..2c64e54 100644
--- a/test/apply/ref.xspec
+++ b/test/apply/ref.xspec
@@ -375,6 +375,32 @@
                      sequence"
               test="f:length( $x:result ) = count( $x:result )" />
     </scenario>
+
+
+    <scenario label="operating adjacent to other data">
+      <call function="f:set-args">
+        <param name="fnref" select="$test-fn,
+                                    $args/foo:a,
+                                    $args/foo:b" />
+        <param name="args"  select="(1, 2)" />
+      </call>
+
+      <expect label="retains target QName"
+              test="f:QName( $x:result ) = f:QName( $test-fn )" />
+
+      <expect label="reduces arity by number of arguments"
+              test="f:arity( $x:result ) = f:arity( $test-fn ) - 2" />
+
+      <!-- notice that the length _does not_ reflect adjacent data -->
+      <expect label="produces length equal to length of constructed
+                     sequence, sans adjacent data"
+              test="f:length( $x:result ) = count( $x:result ) - 2" />
+
+      <variable name="rlength" select="count( $x:result )" />
+      <expect label="retains adjacent data by reference"
+              test="$x:result[ $rlength - 1 ] is $args/foo:a
+                    and $x:result[ $rlength ] is $args/foo:b" />
+    </scenario>
   </scenario>