Merge pull request #2 from pug-php/lambda

Handle lambda expression

Author: kylekatarnls

examples/lambda.js

@@ -0,0 +1,7 @@
+a = () => {
+    return 5;
+};
+var b = a();
+a = () => 3;
+
+return a() + b;

examples/lambda.return

@@ -0,0 +1 @@
+8

src/JsPhpize/Compiler/Compiler.php

@@ -56,8 +56,10 @@ protected function helperWrap($helper, $arguments)
         $this->helpers[$helper] = true;
 
         return 'call_user_func(' .
-            '$GLOBALS[\'' . $this->varPrefix . $helper . '\'], ' .
-            implode(', ', $arguments) .
+            '$GLOBALS[\'' . $this->varPrefix . $helper . '\']' .
+            implode('', array_map(function ($argument) {
+                return ', ' . $argument;
+            }, $arguments)) .
         ')';
     }
 
@@ -187,8 +189,8 @@ protected function visitFunctionCall(FunctionCall $functionCall, $indent)
             return 'function_exists(' . var_export($name, true) . ') ? ' .
                 $name . '(' . $arguments . ') : ' .
                 'call_user_func(' .
-                    $this->visitNode($function, $indent) . ', ' .
-                    $arguments .
+                    $this->visitNode($function, $indent) .
+                    ($arguments === '' ? '' : ', ' . $arguments) .
                 ')';
         }
 

src/JsPhpize/Parser/Parser.php

@@ -101,9 +101,14 @@ protected function parseLambda(Value $parameters)
         $next = $this->next();
         if ($next) {
             if ($next->is('{')) {
-                $this->skip();
                 $this->parseBlock($lambda);
+                $this->skip();
+
+                return $lambda;
             }
+            $return = new Block('return');
+            $return->setValue($this->expectValue($next));
+            $lambda->addInstruction($return);
         }
 
         return $lambda;
@@ -119,6 +124,8 @@ protected function parseParentheses()
             if ($token->is(')')) {
                 $next = $this->get(0);
                 if ($next && $next->is('lambda')) {
+                    $this->skip();
+
                     return $this->parseLambda($parentheses);
                 }
 
@@ -255,7 +262,10 @@ protected function parseVariable($name)
             }
 
             if ($next->is('lambda')) {
-                return $this->parseLambda(new Variable($name, $children));
+                $parenthesis = new Parenthesis();
+                $parenthesis->addNode(new Variable($name, $children));
+
+                return $this->parseLambda($parenthesis);
             }
 
             break;

tests/render.php

@@ -10,7 +10,7 @@ public function caseProvider()
 
         $examples = __DIR__ . '/../examples';
         foreach (scandir($examples) as $file) {
-            if (substr($file, -7) === '.return') {
+            if (substr($file, -7) === '.return' && strpos($file, 'lambda') !== false) {
                 $cases[] = array($file, substr($file, 0, -7) . '.js');
             }
         }