You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by sd...@apache.org on 2015/05/31 05:03:10 UTC
svn commit: r1682669 - in /velocity/engine/trunk/velocity-engine-core/src:
main/parser/Parser.jjt test/resources/set/set1.vm test/resources/set/set2.vm
Author: sdumitriu
Date: Sun May 31 03:03:09 2015
New Revision: 1682669
URL: http://svn.apache.org/r1682669
Log:
VELOCITY-863: Regression: #set<tab>left-paren no longer valid grammar
Patch from Mike Kienenberger applied + added test
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt
velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm
velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set2.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=1682669&r1=1682668&r2=1682669&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 Sun May 31 03:03:09 2015
@@ -694,7 +694,7 @@ TOKEN:
<DEFAULT, REFERENCE, REFMODIFIER, REFMOD2>
TOKEN:
{
- <SET_DIRECTIVE: (" "|"\t")* ("#set" | "#{set}") (" ")* "(">
+ <SET_DIRECTIVE: (" "|"\t")* ("#set" | "#{set}") (" "|"\t")* "(">
{
if (! inComment)
{
Modified: velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm?rev=1682669&r1=1682668&r2=1682669&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm (original)
+++ velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm Sun May 31 03:03:09 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/trunk/velocity-engine-core/src/test/resources/set/set2.vm
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set2.vm?rev=1682669&r1=1682668&r2=1682669&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set2.vm (original)
+++ velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set2.vm Sun May 31 03:03:09 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
Re: svn commit: r1682669 - in /velocity/engine/trunk/velocity-engine-core/src:
main/parser/Parser.jjt test/resources/set/set1.vm test/resources/set/set2.vm
Posted by Mike Kienenberger <mk...@gmail.com>.
Thanks for the test.
I was getting around to creating one, but hadn't done so yet.
On Sat, May 30, 2015 at 11:03 PM, <sd...@apache.org> wrote:
> Author: sdumitriu
> Date: Sun May 31 03:03:09 2015
> New Revision: 1682669
>
> URL: http://svn.apache.org/r1682669
> Log:
> VELOCITY-863: Regression: #set<tab>left-paren no longer valid grammar
> Patch from Mike Kienenberger applied + added test
>
> Modified:
> velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt
> velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm
> velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set2.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=1682669&r1=1682668&r2=1682669&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 Sun May 31 03:03:09 2015
> @@ -694,7 +694,7 @@ TOKEN:
> <DEFAULT, REFERENCE, REFMODIFIER, REFMOD2>
> TOKEN:
> {
> - <SET_DIRECTIVE: (" "|"\t")* ("#set" | "#{set}") (" ")* "(">
> + <SET_DIRECTIVE: (" "|"\t")* ("#set" | "#{set}") (" "|"\t")* "(">
> {
> if (! inComment)
> {
>
> Modified: velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm
> URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm?rev=1682669&r1=1682668&r2=1682669&view=diff
> ==============================================================================
> --- velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm (original)
> +++ velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set1.vm Sun May 31 03:03:09 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/trunk/velocity-engine-core/src/test/resources/set/set2.vm
> URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set2.vm?rev=1682669&r1=1682668&r2=1682669&view=diff
> ==============================================================================
> --- velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set2.vm (original)
> +++ velocity/engine/trunk/velocity-engine-core/src/test/resources/set/set2.vm Sun May 31 03:03:09 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
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
For additional commands, e-mail: dev-help@velocity.apache.org