Added XObjectPtr parameter to FunctionTransform

* the given XObject is passed to the called transformation
** this was done to enable templates to pass information to each other
** this should support any type usable in a XPath context to be passed as an argument
* expanded FunctionTransform test case accordingly

4 files changed, 18 insertions, 1 deletions

diff --git a/src/support/stylesheet_parameter_guard.cc b/src/support/stylesheet_parameter_guard.cc
index f82c2d5..399bccb 100644
--- a/src/support/stylesheet_parameter_guard.cc
+++ b/src/support/stylesheet_parameter_guard.cc
@@ -33,4 +33,14 @@ void StylesheetParameterGuard::set(
 	);
 }
 
+void StylesheetParameterGuard::set(
+	const std::string& key,
+	const xalan::XObjectPtr& value
+) {
+	this->transformer_.setStylesheetParam(
+		key.data(),
+		value
+	);
+}
+
 }
diff --git a/src/support/stylesheet_parameter_guard.h b/src/support/stylesheet_parameter_guard.h
index f0622ad..7fa425e 100644
--- a/src/support/stylesheet_parameter_guard.h
+++ b/src/support/stylesheet_parameter_guard.h
@@ -2,6 +2,7 @@
 #define INPUTXSLT_SRC_SUPPORT_STYLESHEET_PARAMETER_GUARD_H_
 
 #include <xalanc/XalanTransformer/XalanTransformer.hpp>
+#include <xalanc/XPath/XObject.hpp>
 
 #include <string>
 #include <unordered_map>
@@ -24,6 +25,7 @@ class StylesheetParameterGuard {
 
 		void set(const map&);
 		void set(const std::string&, const std::string&);
+		void set(const std::string&, const xalan::XObjectPtr&);
 
 	private:
 		xalan::XalanTransformer& transformer_;
diff --git a/src/support/tuple/mapper.h b/src/support/tuple/mapper.h
index c95365e..28c5f3b 100644
--- a/src/support/tuple/mapper.h
+++ b/src/support/tuple/mapper.h
@@ -55,7 +55,7 @@ namespace Mapper {
 			)
 		);
 	}
-};
+}
 
 }
 
diff --git a/src/support/tuple/xobject_value.cc b/src/support/tuple/xobject_value.cc
index 3883436..fac4d96 100644
--- a/src/support/tuple/xobject_value.cc
+++ b/src/support/tuple/xobject_value.cc
@@ -13,6 +13,11 @@ std::string get<std::string>(const xalan::XObjectPtr& ptr) {
 	return toString(ptr->str());
 }
 
+template <>
+xalan::XObjectPtr get<xalan::XObjectPtr>(const xalan::XObjectPtr& ptr) {
+	return ptr;
+}
+
 }
 
 }