Fix function calls

Author: kylekatarnls

examples/function.anonymous.js

@@ -0,0 +1,5 @@
+a = function () {
+    return () => "foo";
+};
+
+return a()();

examples/function.anonymous.return

@@ -0,0 +1 @@
+foo

src/JsPhpize/Compiler/Compiler.php

@@ -183,19 +183,20 @@ protected function visitFunctionCall(FunctionCall $functionCall, $indent)
         $function = $functionCall->function;
         $arguments = $functionCall->arguments;
         $arguments = $this->visitNodesArray($arguments, $indent, ', ');
+        $call = 'call_user_func(' .
+            $this->visitNode($function, $indent) .
+            ($arguments === '' ? '' : ', ' . $arguments) .
+        ')';
 
         if ($function instanceof Variable) {
             $name = $function->name;
 
             return 'function_exists(' . var_export($name, true) . ') ? ' .
                 $name . '(' . $arguments . ') : ' .
-                'call_user_func(' .
-                    $this->visitNode($function, $indent) .
-                    ($arguments === '' ? '' : ', ' . $arguments) .
-                ')';
+                $call;
         }
 
-        return $this->visitNode($function, $indent) . '(' . $arguments . ')';
+        return $call;
     }
 
     protected function visitHooksArray(HooksArray $array, $indent)

src/JsPhpize/Nodes/Block.php

@@ -10,7 +10,7 @@ class Block extends Node
     protected $type;
 
     /**
-     * @var Value
+     * @var Node
      */
     protected $value;
 
@@ -108,7 +108,7 @@ public function endInstruction()
         $this->inInstruction = false;
     }
 
-    public function setValue(Value $value)
+    public function setValue(Node $value)
     {
         if ($this->type === 'for') {
             $value->setSeparator(';');

src/JsPhpize/Parser/Parser.php

@@ -325,21 +325,61 @@ protected function parseTernary(Node $condition)
 
     protected function parseValue($token)
     {
-        $value = $token->is('variable')
+        return $token->is('variable')
             ? $this->parseVariable($token->value)
             : new Constant($token->type, $token->value);
+    }
+
+    protected function getInitialValue($token)
+    {
+        if ($token->is('function')) {
+            $function = new Block('function');
+            $token = $this->get(0);
+            if ($token->is('variable')) {
+                $this->skip();
+                $token = $this->get(0);
+            }
+            if (!$token->is('(')) {
+                $this->unexpected($token);
+            }
+            $this->skip();
+            $function->setValue($this->parseParentheses());
+            $token = $this->get(0);
+            if (!$token->is('{')) {
+                $this->unexpected($token);
+            }
+            $this->skip();
+            $this->parseBlock($function);
+            $this->skip();
+
+            return $function;
+        }
+        if ($token->is('(')) {
+            return $this->parseParentheses();
+        }
+        if ($token->is('[')) {
+            return $this->parseHooksArray();
+        }
+        if ($token->is('{')) {
+            return $this->parseBracketsArray();
+        }
+        if ($token->isOperator() && $token->isIn('~', '!', '--', '++', '-', '+', 'delete', 'typeof', 'void')) {
+            $value = $this->expectValue($this->next(), $token);
+            $value->prepend($token->type);
 
+            return $value;
+        }
+        if ($token->isValue()) {
+            return $this->parseValue($token);
+        }
+    }
+
+    protected function appendFunctionsCalls(&$value)
+    {
         while ($token = $this->get(0)) {
             if ($token->isValue()) {
                 $this->unexpected($this->next());
             }
-            if ($token->is('(')) {
-                $this->skip();
-                $arguments = array();
-                $value = new FunctionCall($value, $this->parseParentheses()->nodes);
-
-                continue;
-            }
             if ($token->is('{') || $token->expectNoLeftMember()) {
                 $this->unexpected($this->next());
             }
@@ -349,6 +389,13 @@ protected function parseValue($token)
 
                 continue;
             }
+            if ($token->is('(')) {
+                $this->skip();
+                $arguments = array();
+                $value = new FunctionCall($value, $this->parseParentheses()->nodes);
+
+                continue;
+            }
             if ($token->isOperator()) {
                 if ($token->isIn('++', '--')) {
                     $value->append($this->next()->type);
@@ -374,52 +421,16 @@ protected function parseValue($token)
 
             break;
         }
-
-        return $value;
     }
 
     protected function getValueFromToken($token)
     {
-        if ($token->is('function')) {
-            $function = new Block('function');
-            $token = $this->get(0);
-            if ($token->is('variable')) {
-                $this->skip();
-                $token = $this->get(0);
-            }
-            if (!$token->is('(')) {
-                $this->unexpected($token);
-            }
-            $this->skip();
-            $function->setValue($this->parseParentheses());
-            $token = $this->get(0);
-            if (!$token->is('{')) {
-                $this->unexpected($token);
-            }
-            $this->skip();
-            $this->parseBlock($function);
-            $this->skip();
-
-            return $function;
-        }
-        if ($token->is('(')) {
-            return $this->parseParentheses();
-        }
-        if ($token->is('[')) {
-            return $this->parseHooksArray();
+        $value = $this->getInitialValue($token);
+        if ($value) {
+            $this->appendFunctionsCalls($value);
         }
-        if ($token->is('{')) {
-            return $this->parseBracketsArray();
-        }
-        if ($token->isOperator() && $token->isIn('~', '!', '--', '++', '-', '+', 'delete', 'typeof', 'void')) {
-            $value = $this->expectValue($this->next(), $token);
-            $value->prepend($token->type);
 
-            return $value;
-        }
-        if ($token->isValue()) {
-            return $this->parseValue($token);
-        }
+        return $value;
     }
 
     public function parseBlock($block)
@@ -458,7 +469,7 @@ public function parseBlock($block)
                     case 'continue':
                     case 'break':
                         $afterKeyword = $this->get(0);
-                        if ($afterKeyword && $afterKeyword->isValue()) {
+                        if (!$afterKeyword->is(';')) {
                             $value = $this->expectValue($this->next());
                             $keyword->setValue($value);
                         }