Fix multi-line function blocks

Author: kylekatarnls

examples/block-ternary.js

@@ -0,0 +1,12 @@
+var b;
+var foo = function () {
+    b = 2;
+
+    return []
+        ? 9
+        : b;
+};
+var a = (foo)
+    ('foo');
+
+return a;

examples/block-ternary.return

@@ -0,0 +1 @@
+2

examples/sub-child.js

@@ -0,0 +1,15 @@
+a = {
+    b: {
+        c: function () {
+            return {
+                d: [null, null, {
+                    foo: function () {
+                        return 'bar';
+                    }
+                }]
+            }
+        }
+    }
+};
+
+return a.b['c']().d[2].foo();

examples/sub-child.return

@@ -0,0 +1 @@
+bar

src/JsPhpize/Nodes/FunctionCall.php

@@ -2,10 +2,12 @@
 
 namespace JsPhpize\Nodes;
 
+use JsPhpize\Parser\Exception;
+
 class FunctionCall extends Value
 {
     /**
-     * @var Value
+     * @var Value|Block
      */
     protected $function;
 
@@ -24,8 +26,12 @@ class FunctionCall extends Value
      */
     protected $applicant;
 
-    public function __construct(Value $function, array $arguments, array $children, $applicant = null)
+    public function __construct(Node $function, array $arguments, array $children, $applicant = null)
     {
+        if (!($function instanceof Value || $function instanceof Block)) {
+            throw new Exception('Unexpected called type ' . get_class($function), 24);
+        }
+
         $this->function = $function;
         $this->arguments = $arguments;
         $this->applicant = $applicant;

src/JsPhpize/Parser/Parser.php

@@ -62,15 +62,6 @@ protected function parseLambda(Value $parameters)
         return $lambda;
     }
 
-    protected function parseValueCompletion(&$base, $token)
-    {
-        if ($token && $token->is('?')) {
-            $base = $this->parseTernary($base);
-        }
-
-        $this->appendFunctionsCalls($base);
-    }
-
     protected function parseParentheses()
     {
         $parentheses = new Parenthesis();
@@ -291,9 +282,10 @@ protected function parseValue($token)
             : new Constant($token->type, $token->value);
     }
 
-    protected function parseFunction($token)
+    protected function parseFunction()
     {
         $function = new Block('function');
+        $function->enableMultipleInstructions();
         $token = $this->get(0);
         if ($token && $token->type === 'variable') {
             $this->skip();
@@ -313,7 +305,6 @@ protected function parseFunction($token)
 
         $this->skip();
         $this->parseBlock($function);
-        $this->skip();
 
         return $function;
     }
@@ -367,9 +358,8 @@ protected function parseLet()
 
     protected function parseInstructions($block)
     {
-        $endToken = $this->getEndTokenFromBlock($block);
         while ($token = $this->next()) {
-            if ($token->is($endToken)) {
+            if ($token->is($block->multipleInstructions ? '}' : ';')) {
                 break;
             }
 
@@ -391,16 +381,13 @@ protected function parseInstructions($block)
                 continue;
             }
 
-            if ($token->isIn('?', '(', '[') || $token->isOperator()) {
-                $value = $block->value;
-                $this->parseValueCompletion($value, $token);
-                $block->addInstruction($value);
-
-                continue;
-            }
 
             if ($token->is(';') || !$this->engine->getOption('strict')) {
                 $block->endInstruction();
+//                $next = $this->get(0);
+//                if ($block->type !== 'function' && $next && $next->is('}')) {
+//                    break;
+//                }
 
                 continue;
             }
@@ -412,11 +399,6 @@ protected function parseInstructions($block)
     public function parseBlock($block)
     {
         $this->stack[] = $block;
-        $next = $this->get(0);
-        if ($next && $next->is('(') && !($block instanceof Main)) {
-            $this->skip();
-            $block->setValue($this->parseParentheses());
-        }
         if (!$block->multipleInstructions) {
             $next = $this->get(0);
             if ($next && $next->is('{')) {

src/JsPhpize/Parser/TokenExtractor.php

@@ -63,11 +63,6 @@ protected function getVariableChildFromToken(Token $token)
         }
     }
 
-    protected function getEndTokenFromBlock($block)
-    {
-        return $block->multipleInstructions ? '}' : ';';
-    }
-
     protected function getInstructionFromToken($token)
     {
         if ($token->type === 'keyword') {
@@ -110,7 +105,7 @@ protected function handleParentheses($keyword, $afterKeyword)
     protected function getInitialValue($token)
     {
         if ($token->isFunction()) {
-            return $this->parseFunction($token);
+            return $this->parseFunction();
         }
         if ($token->is('(')) {
             return $this->parseParentheses();

tests/badSyntaxes.php

@@ -1,6 +1,8 @@
 <?php
 
 use JsPhpize\JsPhpize;
+use JsPhpize\Nodes\FunctionCall;
+use JsPhpize\Nodes\Instruction;
 
 class BadSyntaxesTest extends \PHPUnit_Framework_TestCase
 {
@@ -93,4 +95,13 @@ public function testTernaryMissingFalseValue()
         $jsPhpize = new JsPhpize();
         $jsPhpize->render('a = true ? true :');
     }
+
+    /**
+     * @expectedException     \JsPhpize\Parser\Exception
+     * @expectedExceptionCode 24
+     */
+    public function testBadFunctionCall()
+    {
+        new FunctionCall(new Instruction(), array(), array());
+    }
 }