Author: cbrisson
Date: Fri Oct 12 16:06:42 2018
New Revision: 1843686
URL: http://svn.apache.org/viewvc?rev=1843686&view=rev
Log:
[engine] Fix parser regression in 2.0
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/diabolical.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/diabolical.vm
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=1843686&r1=1843685&r2=1843686&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 Fri
Oct 12 16:06:42 2018
@@ -781,7 +781,7 @@ TOKEN:
* http://www.engr.mun.ca/~theo/JavaCC-FAQ/javacc-faq-ie.htm#tth_sEc3.12
*
*/
-<DEFAULT, PRE_REFERENCE, PRE_OLD_REFERENCE, REFERENCE, REFMODIFIER, REFMOD2>
+<DEFAULT, PRE_REFERENCE, PRE_OLD_REFERENCE, REFERENCE, REFMODIFIER, REFMOD2,
REFMOD3>
TOKEN:
{
<SET_DIRECTIVE: ("#set" | "#{set}") (" "|"\t")* "(">
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/diabolical.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/diabolical.cmp?rev=1843686&r1=1843685&r2=1843686&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/diabolical.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/diabolical.cmp
Fri Oct 12 16:06:42 2018
@@ -48,3 +48,6 @@ $nullToString
$nullToString.toString()
+
+$
+$fooo$fooo.$fooo.bar$fooo.bar($fooo.bar()
\ No newline at end of file
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/diabolical.vm
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/diabolical.vm?rev=1843686&r1=1843685&r2=1843686&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/diabolical.vm
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/diabolical.vm
Fri Oct 12 16:06:42 2018
@@ -65,3 +65,10 @@ $nullToString
$nullToString.toString()
$!nullToString
$!nullToString.toString()
+
+$#set($foo = $bar)
+$fooo#set($foo = $bar)
+$fooo.#set($foo = $bar)
+$fooo.bar#set($foo = $bar)
+$fooo.bar(#set($foo = $bar)
+$fooo.bar()#set($foo = $bar)
