Fixed a trailing semicolon in variadics (#61)

- Optimized iterator ID - Added variadic tests
Talesoft · Feb 3, 2016 · b355159 · b355159
1 parent d297693
commit b355159
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/Compiler.php b/Compiler.php
@@ -200,6 +200,13 @@ class Compiler
      */
     private $_level;
 
+    /**
+     * Contains the current iterator ID to avoid name collisions.
+     *
+     * @var int
+     */
+    private $_iteratorId;
+
     /**
      * Creates a new compiler instance.
      *
@@ -441,6 +448,7 @@ public function compile($input, $path = null)
         $this->_calledMixins = [];
         $this->_blocks = [];
         $this->_level = 0;
+        $this->_iteratorId = 0;
 
         //Parse the input into an AST
         $node = null;
@@ -1321,12 +1329,12 @@ protected function compileMixins()
 
             if ($variadicIndex !== null) {
 
-                $args[$variadicName] = "array_slice(\$__arguments, $variadicIndex);";
+                $args[$variadicName] = "array_slice(\$__arguments, $variadicIndex)";
             }
 
             $phtml .= $this->createCode(
                     '$__mixins[\''.$name.'\'] = function(array $__arguments) use($__args, $__mixins) {
-                        static $__defaults = '.$this->exportArray($args).';
+                        $__defaults = '.$this->exportArray($args).';
                         $__arguments = array_replace($__defaults, $__arguments);
                         $__args = array_replace($__args, $__arguments);
                         extract($__args);
@@ -1612,8 +1620,6 @@ protected function compileWhen(Node $node)
     protected function compileEach(Node $node)
     {
 
-        static $id = 0;
-
         $subject = $node->subject;
 
         if ($this->isVariable($subject))
@@ -1624,7 +1630,7 @@ protected function compileEach(Node $node)
         if ($node->keyName)
             $as = "\${$node->keyName} => ".$as;
 
-        $var = '$__iterator'.($id++);
+        $var = '$__iterator'.($this->_iteratorId++);
         $phtml = $this->createCode("$var = {$subject};").$this->newLine();
         $phtml .= $this->indent().$this->createCode("foreach ($var as $as) {").$this->newLine();
         $phtml .= $this->compileChildren($node->children).$this->newLine();

diff --git a/Test/MixinTest.php b/Test/MixinTest.php
@@ -14,9 +14,7 @@ public function setUp()
     {
 
         $this->_renderer = new Renderer([
-            'adapterOptions' => [
-                'path' => __DIR__.'/cache/mixins'
-            ],
+            'cachePath' => __DIR__.'/cache/mixins',
             'pretty' => false,
             'paths' => [__DIR__.'/views/mixins']
         ]);
@@ -63,4 +61,19 @@ public function testIdAndClassForwarding()
             'id-and-class-forwarding'
         ));
     }
+
+    public function testVariadic()
+    {
+
+        $this->assertEquals('<h1>Test 1</h1><item name="Item 1" id="51"></item><item name="Item 2" id="52"></item><item name="Item 4" id="54"></item><h1>Test 2</h1><item name="Item 5" id="55"></item><item name="Item 6" id="56"></item><item name="Item 7" id="57"></item>', $this->_renderer->render('variadic', ['items' => [
+            ['name' => 'Item 1', 'id' => 51],
+            ['name' => 'Item 2', 'id' => 52],
+            ['name' => 'Item 3', 'id' => 53],
+            ['name' => 'Item 4', 'id' => 54],
+            ['name' => 'Item 5', 'id' => 55],
+            ['name' => 'Item 6', 'id' => 56],
+            ['name' => 'Item 7', 'id' => 57],
+            ['name' => 'Item 8', 'id' => 58],
+        ]]));
+    }
 }
diff --git a/Test/views/mixins/variadic.jade b/Test/views/mixins/variadic.jade
@@ -0,0 +1,11 @@
+
+mixin item(title, ...items)
+
+    h1= $title
+    each $item in $items
+        item(name=$item['name'], id=$item['id'])
+
+
+
++item('Test 1', $items[0], $items[1], $items[3])
++item('Test 2', $items[4], $items[5], $items[6])