make else clause also work in async for loops

mozilla · Sep 30, 2014 · da13ddc · da13ddc
1 parent 357e41e
commit da13ddc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/src/compiler.js b/src/compiler.js
@@ -765,6 +765,12 @@ var Compiler = Object.extend({
             this.emitLine(this.buffer + ' += ' + output + ';');
         }
 
+        if (node.else_) {
+          this.emitLine('if (!' + arr + '.length) {');
+          this.compile(node.else_, frame);
+          this.emitLine('}');
+        }
+
         this.emitLine('frame = frame.pop();');
     },
 
@@ -1085,9 +1091,9 @@ var Compiler = Object.extend({
 });
 
 // var c = new Compiler();
-// var src = '{% macro foo() %}{% include "include.html" %}{% endmacro %} This is my template {{ foo() }}';
+// var src = '{% asyncEach i in arr %}{{ i }}{% else %}empty{% endeach %}';
 // var ast = transformer.transform(parser.parse(src));
-//nodes.printNodes(ast);
+// nodes.printNodes(ast);
 // c.compile(ast);
 // var tmpl = c.getCode();
 // console.log(tmpl);

diff --git a/src/parser.js b/src/parser.js
@@ -184,8 +184,8 @@ var Parser = Object.extend({
         node.body = this.parseUntilBlocks(endBlock, 'else');
 
         if(this.skipSymbol('else')) {
-          this.advanceAfterBlockEnd('else');
-          node.else_ = this.parseUntilBlocks(endBlock);
+            this.advanceAfterBlockEnd('else');
+            node.else_ = this.parseUntilBlocks(endBlock);
         }
 
         this.advanceAfterBlockEnd();
@@ -1153,8 +1153,7 @@ var Parser = Object.extend({
 //     console.log(util.inspect(t));
 // }
 
-// var p = new Parser(lexer.lex('hello {% foo %} {{ "hi" | bar }} {% endfoo %} end'));
-// p.extensions = [new FooExtension()];
+// var p = new Parser(lexer.lex('{% if not x %}foo{% endif %}'));
 // var n = p.parseAsRoot();
 // nodes.printNodes(n);
 

diff --git a/src/transformer.js b/src/transformer.js
@@ -208,7 +208,8 @@ function convertStatements(ast) {
                     node.colno,
                     node.arr,
                     node.name,
-                    node.body
+                    node.body,
+                    node.else_
                 );
             }
         }

diff --git a/tests/compiler.js b/tests/compiler.js
@@ -144,13 +144,11 @@
             equal('{% ' + block + ' i in arr %}{{ i }}{% ' + end + ' %}',
                   { arr: [1, 2, 3, 4, 5] }, '12345');
 
-            if (block == 'for') {
-              equal('{% ' + block + ' i in arr %}{{ i }}{% else %}empty{% ' + end + ' %}',
-                    { arr: [1, 2, 3, 4, 5] }, '12345');
+            equal('{% ' + block + ' i in arr %}{{ i }}{% else %}empty{% ' + end + ' %}',
+                  { arr: [1, 2, 3, 4, 5] }, '12345');
 
-              equal('{% ' + block + ' i in arr %}{{ i }}{% else %}empty{% ' + end + ' %}',
-                    { arr: [] }, 'empty');
-            }
+            equal('{% ' + block + ' i in arr %}{{ i }}{% else %}empty{% ' + end + ' %}',
+                  { arr: [] }, 'empty');
 
             equal('{% ' + block + ' a, b, c in arr %}' +
                        '{{ a }},{{ b }},{{ c }}.{% ' + end + ' %}',