From e7f9b4789d5b0971a14ac00c9bc834f7154ccb9f Mon Sep 17 00:00:00 2001
From: Adrian Kummerländer
Date: Sat, 17 May 2014 13:56:59 +0200
Subject: Equalized parameter/argument naming pattern accross all external
 functions * names matter, from now on parameters to external functions will
 be called parameters uniformly instead of mixing arguments and parameters

---
 src/function/base.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/function/base.h')

diff --git a/src/function/base.h b/src/function/base.h
index 8145924..cc207c3 100644
--- a/src/function/base.h
+++ b/src/function/base.h
@@ -22,7 +22,7 @@ template <
 >
 class FunctionBase : public xalan::Function {
 	public:
-		typedef std::tuple<Types...> argument_tuple;
+		typedef std::tuple<Types...> parameter_tuple;
 
 		FunctionBase():
 			document_cache_(std::make_shared<DomDocumentCache>()) { }
@@ -30,11 +30,11 @@ class FunctionBase : public xalan::Function {
 		virtual xalan::XObjectPtr execute(
 			xalan::XPathExecutionContext& executionContext,
 			xalan::XalanNode* context,
-			const XObjectArgVectorType& arguments,
+			const XObjectArgVectorType& parameters,
 			const xalan::Locator* locator
 		) const {
-			this->validateArguments(
-				arguments,
+			this->validateParameters(
+				parameters,
 				executionContext,
 				context,
 				locator
@@ -46,7 +46,7 @@ class FunctionBase : public xalan::Function {
 						const_cast<FunctionBase*>(this)
 					)->constructDocument(
 						FilesystemContext(locator),
-						Mapper::template construct<argument_tuple>(arguments)
+						Mapper::template construct<parameter_tuple>(parameters)
 					)
 				)
 			);
@@ -79,29 +79,29 @@ class FunctionBase : public xalan::Function {
 		const xalan::XalanDOMString& getError(
 			xalan::XalanDOMString& result) const {
 			result.assign(std::string(
-				"The function expects "                                +
-				std::to_string(std::tuple_size<argument_tuple>::value) +
-				" argument(s)"
+				"The function expects "                                 +
+				std::to_string(std::tuple_size<parameter_tuple>::value) +
+				" parameter(s)"
 			).data());
 
 			return result;
 		}
 
-		inline void validateArguments(
-			const XObjectArgVectorType& arguments,
+		inline void validateParameters(
+			const XObjectArgVectorType& parameters,
 			xalan::XPathExecutionContext& executionContext,
 			xalan::XalanNode* context,
 			const xalan::Locator* locator
 		) const {
 			const bool anyNull = std::any_of(
-				arguments.begin(),
-				arguments.end(),
+				parameters.begin(),
+				parameters.end(),
 				[](const xalan::XObjectPtr& ptr) -> bool {
 					return ptr.null();
 				}
 			);
 
-			if ( arguments.size() != std::tuple_size<argument_tuple>::value || anyNull ) {
+			if ( parameters.size() != std::tuple_size<parameter_tuple>::value || anyNull ) {
 				xalan::XPathExecutionContext::GetAndReleaseCachedString guard(
 					executionContext
 				);
-- 
cgit v1.2.3