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 2026/01/28 01:43:28 UTC
(xalan-java) branch xalan-j_xslt3.0_mvn updated: committing xalan xslt 3.0 implementation improvements
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 b83a07edc committing xalan xslt 3.0 implementation improvements
b83a07edc is described below
commit b83a07edc56a2a40bb8c484733b376b4f5f83dad
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Wed Jan 28 07:12:42 2026 +0530
committing xalan xslt 3.0 implementation improvements
---
.gitignore | 1 +
.../org/apache/xalan/templates/ElemValueOf.java | 28 ++++++++++++++++++----
.../xpath/functions/string/FuncNormalizeSpace.java | 3 ---
.../xpath/functions/string/FuncTokenize.java | 3 ++-
.../result/misc/_regex-syntax-test-set_result.xml | 2 +-
.../result/w3c_xslt3_testsuite_xalan-j_result.xml | 4 ++--
6 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index b83d22266..731eb433c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/target/
+/.settings/
diff --git a/src/main/java/org/apache/xalan/templates/ElemValueOf.java b/src/main/java/org/apache/xalan/templates/ElemValueOf.java
index 9ea3e8082..0d081c977 100644
--- a/src/main/java/org/apache/xalan/templates/ElemValueOf.java
+++ b/src/main/java/org/apache/xalan/templates/ElemValueOf.java
@@ -1180,13 +1180,31 @@ public class ElemValueOf extends ElemTemplateElement {
* available.
*/
private String getEffectiveSequenceStrValue(ResultSequence seq, String separatorStrValue) {
- String strValue = seq.str();
-
- if (separatorStrValue != null) {
- strValue = strValue.replace(" ", separatorStrValue);
+
+ String result = null;
+
+ StringBuffer strBuff = new StringBuffer();
+ int size1 = seq.size();
+ for (int idx = 0; idx < size1; idx++) {
+ XObject xObj = seq.item(idx);
+ String str1 = XslTransformEvaluationHelper.getStrVal(xObj);
+ if (idx < (size1 - 1)) {
+ if (separatorStrValue != null) {
+ strBuff.append(str1 + separatorStrValue);
+ }
+ else {
+ strBuff.append(str1 + " ");
+ }
+ }
+ else {
+ strBuff.append(str1);
+ }
}
- return strValue;
+ result = strBuff.toString();
+
+ return result;
+
}
/**
diff --git a/src/main/java/org/apache/xpath/functions/string/FuncNormalizeSpace.java b/src/main/java/org/apache/xpath/functions/string/FuncNormalizeSpace.java
index b2b0b11f8..3bf0835c5 100644
--- a/src/main/java/org/apache/xpath/functions/string/FuncNormalizeSpace.java
+++ b/src/main/java/org/apache/xpath/functions/string/FuncNormalizeSpace.java
@@ -15,9 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * $Id$
- */
package org.apache.xpath.functions.string;
import org.apache.xml.dtm.DTM;
diff --git a/src/main/java/org/apache/xpath/functions/string/FuncTokenize.java b/src/main/java/org/apache/xpath/functions/string/FuncTokenize.java
index 2d3c793df..ead3227a7 100644
--- a/src/main/java/org/apache/xpath/functions/string/FuncTokenize.java
+++ b/src/main/java/org/apache/xpath/functions/string/FuncTokenize.java
@@ -141,7 +141,8 @@ public class FuncTokenize extends Function3Args {
throw new javax.xml.transform.TransformerException(ex.getMessage(), srcLocator);
}
- for (int idx = 0; idx < tokenList.size(); idx++) {
+ int count1 = tokenList.size();
+ for (int idx = 0; idx < count1; idx++) {
resultSeq.add(new XString(tokenList.get(idx)));
}
}
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-syntax-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-syntax-test-set_result.xml
index 102fd6cf2..0ac888998 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-syntax-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-syntax-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-25T11:37:37Z" fail="368" name="regex-syntax" pass="618" run="986" skipped="4" statusUnknown="0">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-28T01:36:25Z" fail="368" name="regex-syntax" pass="618" run="986" skipped="4" statusUnknown="0">
<testResult status="pass" testName="regex-syntax-0001"/>
<testResult status="pass" testName="regex-syntax-0002"/>
<testResult status="pass" testName="regex-syntax-0003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml
index 23132590e..92f59445f 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<testResult dateTime="2026-01-25T11:38:19Z" desc="W3C XSLT 3.0 test suite results" fail="1339" pass="3321" run="4666" skipped="598" success="71.17%" xslt_processor="Apache Xalan XSLT 3.0 development code">
+<testResult dateTime="2026-01-28T01:36:58Z" desc="W3C XSLT 3.0 test suite results" fail="1336" pass="3324" run="4666" skipped="598" success="71.24%" xslt_processor="Apache Xalan XSLT 3.0 development code">
<attr>
<as fail="29" pass="82" run="111" skipped="93" success="73.87%"/>
<avt fail="1" pass="33" run="34" skipped="1" success="97.06%"/>
@@ -60,7 +60,7 @@
<misc>
<built-in-templates fail="2" pass="3" run="5" skipped="1" success="60.0%"/>
<regex-syntax fail="368" pass="618" run="986" skipped="4" success="62.68%"/>
- <regex fail="25" pass="39" run="64" skipped="1" success="60.94%"/>
+ <regex fail="22" pass="42" run="64" skipped="1" success="65.62%"/>
<whitespace fail="12" pass="16" run="28" skipped="0" success="57.14%"/>
</misc>
<type>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org