Author: sdumitriu
Date: Sun May 31 12:59:51 2015
New Revision: 1682731
URL: http://svn.apache.org/r1682731
Log:
VELOCITY-863: Regression: #set<tab>left-paren no longer valid grammar
Patch from Mike Kienenberger applied + added test
Modified:
velocity/engine/branches/1.7.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
velocity/engine/branches/1.7.x/src/parser/Parser.jjt
velocity/engine/branches/1.7.x/test/set/set1.vm
velocity/engine/branches/1.7.x/test/set/set2.vm
Modified:
velocity/engine/branches/1.7.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java?rev=1682731&r1=1682730&r2=1682731&view=diff
==============================================================================
---
velocity/engine/branches/1.7.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
(original)
+++
velocity/engine/branches/1.7.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
Sun May 31 12:59:51 2015
@@ -2194,7 +2194,7 @@ private int jjMoveNfa_5(int startState,
jjCheckNAddTwoStates(6, 11);
break;
case 3:
- if (curChar == 32)
+ if ((0x100000200L & l) != 0L)
jjAddStates(112, 113);
break;
case 4:
@@ -3621,7 +3621,7 @@ private int jjMoveNfa_0(int startState,
jjCheckNAddTwoStates(6, 11);
break;
case 3:
- if (curChar == 32)
+ if ((0x100000200L & l) != 0L)
jjAddStates(112, 113);
break;
case 4:
@@ -4072,7 +4072,7 @@ private int jjMoveNfa_4(int startState,
jjCheckNAddTwoStates(6, 11);
break;
case 3:
- if (curChar == 32)
+ if ((0x100000200L & l) != 0L)
jjAddStates(112, 113);
break;
case 4:
@@ -4694,7 +4694,7 @@ private int jjMoveNfa_1(int startState,
jjCheckNAddTwoStates(6, 11);
break;
case 3:
- if (curChar == 32)
+ if ((0x100000200L & l) != 0L)
jjAddStates(112, 113);
break;
case 4:
Modified: velocity/engine/branches/1.7.x/src/parser/Parser.jjt
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/src/parser/Parser.jjt?rev=1682731&r1=1682730&r2=1682731&view=diff
==============================================================================
--- velocity/engine/branches/1.7.x/src/parser/Parser.jjt (original)
+++ velocity/engine/branches/1.7.x/src/parser/Parser.jjt Sun May 31 12:59:51
2015
@@ -662,7 +662,7 @@ TOKEN:
<DEFAULT, REFERENCE, REFMODIFIER, REFMOD2>
TOKEN:
{
- <SET_DIRECTIVE: (" "|"\t")* ("#set" | "#{set}") (" ")* "(">
+ <SET_DIRECTIVE: (" "|"\t")* ("#set" | "#{set}") (" "|"\t")* "(">
{
if (! inComment)
{
Modified: velocity/engine/branches/1.7.x/test/set/set1.vm
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/test/set/set1.vm?rev=1682731&r1=1682730&r2=1682731&view=diff
==============================================================================
--- velocity/engine/branches/1.7.x/test/set/set1.vm (original)
+++ velocity/engine/branches/1.7.x/test/set/set1.vm Sun May 31 12:59:51 2015
@@ -2,12 +2,12 @@
## is not accepted
set1
-#set($abc = "123")
+#set ($abc = "123")
$abc
-#set($abc = $boohoo)
+#set ($abc = $boohoo)
$abc
-#set($map = {})
+#set ($map = {})
#set($map.foo = "foo")
#set($map.bar = "bar")
$map.foo
Modified: velocity/engine/branches/1.7.x/test/set/set2.vm
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/test/set/set2.vm?rev=1682731&r1=1682730&r2=1682731&view=diff
==============================================================================
--- velocity/engine/branches/1.7.x/test/set/set2.vm (original)
+++ velocity/engine/branches/1.7.x/test/set/set2.vm Sun May 31 12:59:51 2015
@@ -2,12 +2,12 @@
## IS accepted
set2
-#set($abc = "123")
+#set ($abc = "123")
$abc
-#set($abc = $boohoo)
+#set ($abc = $boohoo)
$abc
-#set($map = {})
+#set ($map = {})
#set($map.foo = "foo")
#set($map.bar = "bar")
$map.foo
