(commons-jexl) branch JEXL-445 updated: JEXL-445 : rebase on 3.6.3;

[henrib]

This is an automated email from the ASF dual-hosted git repository.

henrib pushed a commit to branch JEXL-445
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git


The following commit(s) were added to refs/heads/JEXL-445 by this push:
     new 6e73a3b0 JEXL-445 : rebase on 3.6.3;
6e73a3b0 is described below

commit 6e73a3b0def88baee24cdb6dd06a6c03b6333687
Author: henrib <hen...@apache.org>
AuthorDate: Mon Feb 16 19:11:28 2026 +0100

    JEXL-445 : rebase on 3.6.3;
---
 src/main/java/org/apache/commons/jexl3/parser/Parser.jjt  | 2 +-
 src/test/java/org/apache/commons/jexl3/Issues300Test.java | 2 +-
 src/test/java/org/apache/commons/jexl3/Issues400Test.java | 4 ++--
 src/test/java/org/apache/commons/jexl3/SwitchTest.java    | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt 
b/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
index b3410c3f..c7722dab 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
+++ b/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
@@ -103,7 +103,7 @@ public final class Parser extends JexlParser
             String msg = et == null ? xparse.getMessage() : et.image;
             throw new JexlException.Parsing(ji, msg).clean();
         } finally {
-            token_source.defaultLexState = DEFAULT;
+            //token_source.defaultLexState = DEFAULT;
             token_source.ignoredTokens = Collections.emptySet();
             cleanup(previous);
             jjtree.reset();
diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java 
b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index f9879567..0ba42b12 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -685,7 +685,7 @@ class Issues300Test {
         final String parsed = expr0.getParsedText();
         assertEquals(src42, parsed);
         final JexlException.Parsing xparse = 
assertThrows(JexlException.Parsing.class, () -> jexl.createExpression("new()"), 
"should not parse");
-        assertTrue(xparse.toString().contains(")"));
+        assertTrue(xparse.toString().contains("("));
     }
 
     @Test
diff --git a/src/test/java/org/apache/commons/jexl3/Issues400Test.java 
b/src/test/java/org/apache/commons/jexl3/Issues400Test.java
index 8b2a44ba..e27aacca 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues400Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues400Test.java
@@ -1126,7 +1126,7 @@ public class Issues400Test {
             Assertions.fail("should have thrown a parsing error in '&'");
         } catch (JexlException xjexl) {
             // parsing error in '&'
-            Assertions.assertTrue(xjexl.getMessage().contains("&"));
+            Assertions.assertTrue(xjexl.getMessage().contains("="));
         }
         // JEXL-456: java.lang.NullPointerException:
         // Cannot invoke 
"org.apache.commons.jexl3.internal.Scope.getCaptureDeclaration(int)" because 
"blockScope" is null
@@ -1147,7 +1147,7 @@ public class Issues400Test {
             Assertions.fail("should have thrown a parsing error in '&'");
         } catch (JexlException xjexl) {
             // parsing error in '&'
-            Assertions.assertTrue(xjexl.getMessage().contains("&"));
+            Assertions.assertTrue(xjexl.getMessage().contains("="));
         }
         // JEXL-456: parsing error in 'foo: variable is already declared'
         jexl.createScript("let foo = 0;\nfoo = 42;");
diff --git a/src/test/java/org/apache/commons/jexl3/SwitchTest.java 
b/src/test/java/org/apache/commons/jexl3/SwitchTest.java
index 624edc3c..e0e5c388 100644
--- a/src/test/java/org/apache/commons/jexl3/SwitchTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SwitchTest.java
@@ -20,9 +20,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
+
+import org.apache.commons.jexl3.internal.Debugger;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Tests switch/case statement and expression.
  */