You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2025/04/08 15:11:05 UTC
(xalan-java) branch xalan-j_xslt3.0_mvn updated: committing fix for jira issue XALANJ-2809
This is an automated email from the ASF dual-hosted git repository.
mukulg pushed a commit to branch xalan-j_xslt3.0_mvn
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-j_xslt3.0_mvn by this push:
new baeeb4d94 committing fix for jira issue XALANJ-2809
baeeb4d94 is described below
commit baeeb4d944ae30eb9a86bfaa67f34472530b830d
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Tue Apr 8 20:40:50 2025 +0530
committing fix for jira issue XALANJ-2809
---
src/main/java/org/apache/xpath/functions/FuncDoc.java | 2 +-
.../java/org/apache/xpath/functions/hof/FuncFoldLeft.java | 15 +++++++--------
.../org/apache/xpath/functions/hof/FuncFoldRight.java | 9 ++++-----
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/xpath/functions/FuncDoc.java b/src/main/java/org/apache/xpath/functions/FuncDoc.java
index 3cc925736..4fedb773f 100644
--- a/src/main/java/org/apache/xpath/functions/FuncDoc.java
+++ b/src/main/java/org/apache/xpath/functions/FuncDoc.java
@@ -32,7 +32,7 @@ import org.apache.xpath.objects.XObject;
import org.xml.sax.ErrorHandler;
/**
- * Implementation of an fn:doc function.
+ * Implementation of XPath 3.1 function fn:doc.
*
* @author Mukul Gandhi <mu...@apache.org>
*
diff --git a/src/main/java/org/apache/xpath/functions/hof/FuncFoldLeft.java b/src/main/java/org/apache/xpath/functions/hof/FuncFoldLeft.java
index 7e0d0d253..914c7c5ce 100644
--- a/src/main/java/org/apache/xpath/functions/hof/FuncFoldLeft.java
+++ b/src/main/java/org/apache/xpath/functions/hof/FuncFoldLeft.java
@@ -174,15 +174,15 @@ public class FuncFoldLeft extends XPathHigherOrderBuiltinFunction {
XPath.SELECT, null);
for (int idx = 0; idx < foldLeftFirstArgSeq.size(); idx++) {
Map<QName, XObject> inlineFunctionVarMap = xctxt.getXPathVarMap();
-
- inlineFunctionVarMap.put(new QName(funcItemSecondArgName), foldLeftFirstArgSeq.item(idx));
-
+
if (idx == 0) {
inlineFunctionVarMap.put(new QName(funcItemFirstArgName), foldLeftBaseVal);
}
else {
inlineFunctionVarMap.put(new QName(funcItemFirstArgName), evalResult);
- }
+ }
+
+ inlineFunctionVarMap.put(new QName(funcItemSecondArgName), foldLeftFirstArgSeq.item(idx));
evalResult = inlineFuncXPath.execute(xctxt, contextNode, xctxt.getNamespaceContext());
@@ -199,15 +199,14 @@ public class FuncFoldLeft extends XPathHigherOrderBuiltinFunction {
}
else if ((elemFunction != null) && (transformerImpl != null)) {
for (int idx = 0; idx < foldLeftFirstArgSeq.size(); idx++) {
- ResultSequence argSequence = new ResultSequence();
-
- argSequence.add(foldLeftFirstArgSeq.item(idx));
+ ResultSequence argSequence = new ResultSequence();
if (idx == 0) {
argSequence.add(foldLeftBaseVal);
}
else {
argSequence.add(evalResult);
- }
+ }
+ argSequence.add(foldLeftFirstArgSeq.item(idx));
evalResult = elemFunction.evaluateXslFunction(transformerImpl, argSequence);
}
diff --git a/src/main/java/org/apache/xpath/functions/hof/FuncFoldRight.java b/src/main/java/org/apache/xpath/functions/hof/FuncFoldRight.java
index e84707f07..cb4e54145 100644
--- a/src/main/java/org/apache/xpath/functions/hof/FuncFoldRight.java
+++ b/src/main/java/org/apache/xpath/functions/hof/FuncFoldRight.java
@@ -175,9 +175,9 @@ public class FuncFoldRight extends XPathHigherOrderBuiltinFunction {
XPath.SELECT, null);
for (int idx = foldRightFirstArgSeq.size() - 1; idx >= 0; idx--) {
Map<QName, XObject> inlineFunctionVarMap = xctxt.getXPathVarMap();
-
+
inlineFunctionVarMap.put(new QName(funcItemFirstArgName), foldRightFirstArgSeq.item(idx));
-
+
if (idx == (foldRightFirstArgSeq.size() - 1)) {
inlineFunctionVarMap.put(new QName(funcItemSecondArgName), foldRightBaseVal);
}
@@ -200,9 +200,8 @@ public class FuncFoldRight extends XPathHigherOrderBuiltinFunction {
}
else if ((elemFunction != null) && (transformerImpl != null)) {
for (int idx = foldRightFirstArgSeq.size() - 1; idx >= 0; idx--) {
- ResultSequence argSequence = new ResultSequence();
-
- argSequence.add(foldRightFirstArgSeq.item(idx));
+ ResultSequence argSequence = new ResultSequence();
+ argSequence.add(foldRightFirstArgSeq.item(idx));
if (idx == (foldRightFirstArgSeq.size() - 1)) {
argSequence.add(foldRightBaseVal);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org