Merge pull request #9 from pug-php/1.x

1.x

Author: kylekatarnls

examples/indent.js

@@ -0,0 +1,8 @@
+for (i = 9; i; i--) {
+  if ((function (tiny) {
+    return tiny < 3;
+  })(i)) {
+    continue;
+  }
+  break;
+}

examples/indent.php

@@ -0,0 +1,8 @@
+for ($i = 9; $i; $i--) {
+  if (call_user_func((function ($tiny) {
+    return $tiny < 3;
+  }), $i)) {
+    continue;
+  }
+  break;
+}

src/JsPhpize/Compiler/Compiler.php

@@ -94,8 +94,8 @@ protected function visitAssignation(Assignation $assignation, $indent)
 
     protected function visitBlock(Block $block, $indent)
     {
-        $head = $block->type . ' ' . ($block->value
-            ? $this->visitNode($block->value, $indent)
+        $head = $block->type . ($block->value
+            ? ' ' . $this->visitNode($block->value, $indent)
             : ''
         );
 
@@ -105,7 +105,7 @@ protected function visitBlock(Block $block, $indent)
 
         $letVariables = $this->visitNodesArray($block->getLetVariables(), $indent, '', $indent . "unset(%s);\n");
 
-        return $head . "{\n" .
+        return $head . " {\n" .
             $this->compile($block, '  ' . $indent) .
             $letVariables .
             $indent . '}';
@@ -218,7 +218,18 @@ protected function visitHooksArray(HooksArray $array, $indent)
 
     protected function visitInstruction(Instruction $group, $indent)
     {
-        return $this->visitNodesArray($group->instructions, $indent, '', $indent . "%s;\n");
+        $visitNode = array($this, 'visitNode');
+
+        return implode('', array_map(function ($instruction) use ($visitNode, $indent) {
+            $value = call_user_func($visitNode, $instruction, $indent);
+
+            return $indent .
+                ($instruction instanceof Block && $instruction->handleInstructions()
+                    ? $value
+                    : $value . ';'
+                ) .
+                "\n";
+        }, $group->instructions));
     }
 
     public function visitNode(Node $node, $indent)
@@ -233,12 +244,12 @@ public function visitNode(Node $node, $indent)
             $php = $node->getBefore() . $php . $node->getAfter();
         }
 
-        return $indent . $php;
+        return $php;
     }
 
     protected function visitParenthesis(Parenthesis $parenthesis, $indent)
     {
-        return '(' . $this->visitNodesArray($parenthesis->nodes, $indent, $parenthesis->separator) . ')';
+        return '(' . $this->visitNodesArray($parenthesis->nodes, $indent, $parenthesis->separator . ' ') . ')';
     }
 
     protected function visitTernary(Ternary $ternary, $indent)

src/JsPhpize/Parser/Parser.php

@@ -175,6 +175,37 @@ protected function parseHooksArray()
         throw new Exception('Missing ] to match ' . $exceptionInfos, 6);
     }
 
+    protected function getBracketsArrayItemKeyFromToken($token)
+    {
+        $type = null;
+
+        if ($token->is('keyword')) {
+            $type = 'string';
+            $value = var_export($token->value, true);
+        } elseif ($token->isValue()) {
+            $type = $token->type;
+            $value = $token->value;
+            if ($type === 'variable') {
+                $type = 'string';
+                $value = var_export($value, true);
+            }
+        }
+
+        if ($type) {
+            $token = $this->next();
+            if (!$token) {
+                throw new Exception('Missing value after ' . $value . $this->exceptionInfos(), 12);
+            }
+            if (!$token->is(':')) {
+                $this->unexpected($token);
+            }
+            $key = new Constant($type, $value);
+            $value = $this->expectValue($this->next());
+
+            return array($key, $value);
+        }
+    }
+
     protected function parseBracketsArray()
     {
         $array = new BracketsArray();
@@ -192,28 +223,8 @@ protected function parseBracketsArray()
                 }
                 $this->unexpected($token);
             }
-            $type = null;
-            if ($token->is('keyword')) {
-                $type = 'string';
-                $value = var_export($token->value, true);
-            } elseif ($token->isValue()) {
-                $type = $token->type;
-                $value = $token->value;
-                if ($type === 'variable') {
-                    $type = 'string';
-                    $value = var_export($value, true);
-                }
-            }
-            if ($type) {
-                $token = $this->next();
-                if (!$token) {
-                    throw new Exception('Missing value after ' . $value . $this->exceptionInfos(), 12);
-                }
-                if (!$token->is(':')) {
-                    $this->unexpected($token);
-                }
-                $key = new Constant($type, $value);
-                $value = $this->expectValue($this->next());
+            if ($pair = $this->getBracketsArrayItemKeyFromToken($token)) {
+                list($key, $value) = $pair;
                 $expectComma = true;
                 $array->addItem($key, $value);
 
@@ -440,7 +451,7 @@ protected function getValueFromToken($token)
         return $value;
     }
 
-    protected function parseKeyword($token)
+    protected function parseKeywordStatement($token)
     {
         $name = $token->value;
         $keyword = new Block($name);
@@ -477,6 +488,13 @@ protected function parseKeyword($token)
                     throw new Exception("'" . $keyword->type . "' block need parentheses.", 17);
                 }
         }
+
+        return $keyword;
+    }
+
+    protected function parseKeyword($token)
+    {
+        $keyword = $this->parseKeywordStatement($token);
         if ($keyword->handleInstructions()) {
             $this->parseBlock($keyword);
         }
@@ -494,6 +512,17 @@ protected function parseLet($token)
         return $letVariable->value;
     }
 
+    protected function getInstructionFromToken($token)
+    {
+        if ($token->is('keyword')) {
+            return $this->parseKeyword($token);
+        }
+
+        if ($value = $this->getValueFromToken($token)) {
+            return $value;
+        }
+    }
+
     protected function parseInstructions($block, $waitForClosure)
     {
         while ($token = $this->next()) {
@@ -507,12 +536,8 @@ protected function parseInstructions($block, $waitForClosure)
                 $block->let($this->parseLet($token));
                 continue;
             }
-            if ($token->is('keyword')) {
-                $block->addInstruction($this->parseKeyword($token));
-                continue;
-            }
-            if ($value = $this->getValueFromToken($token)) {
-                $block->addInstruction($value);
+            if ($instruction = $this->getInstructionFromToken($token)) {
+                $block->addInstruction($instruction);
                 continue;
             }
             if ($token->is(';')) {