Allow optional space after : in map passed as parameter to macro

shepherdwind · Jan 7, 2015 · 8dd19a2 · 8dd19a2
1 parent 6b8e9a9
commit 8dd19a2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/parse/index.js b/src/parse/index.js
diff --git a/src/parse/velocity.l b/src/parse/velocity.l
@@ -70,7 +70,7 @@
 <c,run,i>\s+                      { /*ignore whitespace*/ }
 <i,run,c,i>"{"                         { return 'MAP_BEGIN'; }
 <i,run,c,i>"}"                         { return 'MAP_END'; }
-<h,run,c,i>":"                         { return 'MAP_SPLIT'; }
+<h,run,c,i>":"[\s]*                    { return 'MAP_SPLIT'; }
 <mu>"{"                              { yy.begin = true; return 'VAR_BEGIN'; }
 <mu>"}"                              { this.popState(); if (yy.begin === true) { yy.begin = false; return 'VAR_END';} else { return 'CONTENT'; } }
 <mu,h,run,c,i>"("[\s]*/[$'"\[\{\-0-9\w()!] { this.begin("c"); return 'PARENTHESIS'; }

diff --git a/tests/compile.js b/tests/compile.js
@@ -431,6 +431,11 @@ describe('Compile', function(){
       assert.equal(' abd', render(vm, {foo: 'a', bar: 'b', dd: 'd'}))
     })
 
+    it('#macro map argument', function(){
+      var vm = '#macro( d $a)#foreach($_item in $a.entrySet())$_item.key = $_item.value #end#end #d ( {"foo": $foo,"bar":$bar} )'
+      assert.equal(' foo = a bar = b ', render(vm, {foo: 'a', bar: 'b'}))
+    })
+
     it('#noescape', function(){
       var vm = '#noescape()$hello#end'
       assert.equal('hello world', render(vm, {hello: 'hello world'}))

diff --git a/tests/runner/spec.js b/tests/runner/spec.js
@@ -359,6 +359,11 @@ describe('Compile', function(){
       assert.equal(' abd', render(vm, {foo: 'a', bar: 'b', dd: 'd'}))
     })
 
+    it('#macro map argument', function(){
+      var vm = '#macro( d $a)#foreach($_item in $a.entrySet())$_item.key = $_item.value #end#end #d ( {"foo": $foo,"bar":$bar} )'
+      assert.equal(' foo = a bar = b ', render(vm, {foo: 'a', bar: 'b'}))
+    })
+
     it('#noescape', function(){
       var vm = '#noescape()$hello#end'
       assert.equal('hello world', render(vm, {hello: 'hello world'}))