svn commit: r1845429 - in /velocity/engine/trunk/velocity-engine-core/src: main/parser/Parser.jjt test/java/org/apache/velocity/test/AlternateValuesTestCase.java

[cbrisson]

Author: cbrisson
Date: Thu Nov  1 10:25:35 2018
New Revision: 1845429

URL: http://svn.apache.org/viewvc?rev=1845429&view=rev
Log:
[engine] Default values bugfix in parser for numeric literals

Modified:
    velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt
    
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java

Modified: velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt?rev=1845429&r1=1845428&r2=1845429&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt 
(original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt Thu 
Nov  1 10:25:35 2018
@@ -1228,7 +1228,7 @@ TOKEN:
          *  because we want to handle the \n after
          */
 
-        if ( lparen == 0 && !inSet && curLexState != REFMOD2 && curLexState != 
REFINDEX)
+        if ( lparen == 0 && !inSet && curLexState != REFMOD2 && curLexState != 
REFINDEX && curLexState != ALT_VAL)
         {
             stateStackPop();
         }
@@ -1246,7 +1246,7 @@ TOKEN:
          *  because we want to handle the \n after
          */
 
-        if ( lparen == 0 && !inSet && curLexState != REFMOD2)
+        if ( lparen == 0 && !inSet && curLexState != REFMOD2 && curLexState != 
ALT_VAL)
         {
             stateStackPop();
     }

Modified: 
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java?rev=1845429&r1=1845428&r2=1845429&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java
 Thu Nov  1 10:25:35 2018
@@ -59,6 +59,8 @@ public class AlternateValuesTestCase ext
         assertEvalEquals("baz", "${foo|${bar|'baz'}}");
         assertEvalEquals("hop", "${foo.bar.baz()[5]|'hop'}");
         assertEvalEquals("{foo}", "{${foo|'foo'}}");
+        assertEvalEquals("<1>", "<${foo|1}>");
+        assertEvalEquals("<1.1>", "<${foo|1.1}>");
     }
 
 }