[commons-jexl] branch master updated: More grammar cleanup

[he...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new bf432e8f More grammar cleanup
     new 6bc2513e Merge pull request #135 from dmitri-blinov/apache-master
bf432e8f is described below

commit bf432e8f7948d47676bc2b9551cee5315ffea774
Author: Dmitri Blinov <dm...@mail.ru>
AuthorDate: Thu Nov 3 22:13:50 2022 +0300

    More grammar cleanup
---
 src/main/java/org/apache/commons/jexl3/parser/Parser.jjt | 6 +++---
 1 file changed, 3 insertions(+), 3 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 4c5b1b8e..98b4657c 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
+++ b/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
@@ -220,7 +220,7 @@ TOKEN_MGR_DECLS : {}
 /***************************************
  *     Identifier & String tokens
  ***************************************/
-<*> TOKEN :  /* NaN */
+<DEFAULT> TOKEN : /* NaN */
 {
     < NAN_LITERAL : "NaN" >
 }
@@ -574,7 +574,7 @@ void AssignmentExpression() #void : {}
     <rshiftu_assign>  Expression() #SetShiftRightUnsignedNode(2)
   |
     <assign> Expression() #Assignment(2)
-  ) )*
+  ) )?
 }
 
 /***************************************
@@ -590,7 +590,7 @@ void ConditionalExpression() #void : {}
     <ELVIS> Expression() #TernaryNode(2)
   |
     <NULLP> Expression() #NullpNode(2)
-  ) )*
+  ) )?
 }
 
 void ConditionalOrExpression() #void : {}