Test Math constants + fix dot helper test + prepare lambda

Author: kylekatarnls

examples/calcul.js

@@ -2,4 +2,4 @@ a = 4;
 b = 1;
 c = 3;
 
-return b + a * c;
+return round(Math.PI * 100) + b + a * c;

examples/calcul.return

@@ -1 +1 @@
-13
+327

src/JsPhpize/Nodes/Assignation.php

@@ -21,12 +21,16 @@ class Assignation extends Value
      */
     protected $operator;
 
-    public function __construct($operator, Assignable $leftHand, Value $rightHand)
+    public function __construct($operator, Assignable $leftHand, Node $rightHand)
     {
         if (!$leftHand->isAssignable()) {
             throw new Exception($leftHand->getNonAssignableReason(), 9);
         }
 
+        if (!($rightHand instanceof Value) && (!($rightHand instanceof Block) || $rightHand->type !== 'function')) {
+            throw new Exception('Only Value instance or Function block could be assigned.', 19);
+        }
+
         $this->operator = $operator;
         $this->leftHand = $leftHand;
         $this->rightHand = $rightHand;

src/JsPhpize/Parser/Parser.php

@@ -7,6 +7,7 @@
 use JsPhpize\Lexer\Token;
 use JsPhpize\Nodes\Assignation;
 use JsPhpize\Nodes\Block;
+use JsPhpize\Nodes\Value;
 use JsPhpize\Nodes\BracketsArray;
 use JsPhpize\Nodes\Constant;
 use JsPhpize\Nodes\Dyiade;
@@ -90,13 +91,24 @@ protected function exceptionInfos()
 
     protected function unexpected($token)
     {
-        // var_dump($token);
-        // var_dump($this->stack[0]->instructions[2]->instructions[0]);
-        // exit;
-
         throw new Exception('Unexpected ' . $token->type . rtrim(' ' . ($token->value ?: '')) . $this->exceptionInfos(), 8);
     }
 
+    protected function parseLambda(Value $parameters)
+    {
+        $lambda = new Block('function');
+        $lambda->setValue($parameters);
+        $next = $this->next();
+        if ($next) {
+            if ($next->is('{')) {
+                $this->skip();
+                $this->parseBlock($lambda);
+            }
+        }
+
+        return $lambda;
+    }
+
     protected function parseParentheses()
     {
         $parentheses = new Parenthesis();
@@ -105,6 +117,10 @@ protected function parseParentheses()
         while ($token = $this->next()) {
             $debug[] = $token;
             if ($token->is(')')) {
+                $next = $this->get(0);
+                if ($next && $next->is('lambda')) {
+                    return $this->parseLambda($parentheses);
+                }
                 return $parentheses;
             }
             if ($expectComma) {
@@ -237,6 +253,10 @@ protected function parseVariable($name)
                 continue;
             }
 
+            if ($next->is('lambda')) {
+                return $this->parseLambda(new Variable($name, $children));
+            }
+
             break;
         }
 
@@ -303,7 +323,8 @@ protected function parseValue($token)
                 if ($token->isAssignation()) {
                     $this->skip();
                     $arguments = array();
-                    $value = new Assignation($token->type, $value, $this->expectValue($this->next()));
+                    $valueToAssign = $this->expectValue($this->next());
+                    $value = new Assignation($token->type, $value, $valueToAssign);
 
                     continue;
                 }

tests/mainMethods.php

@@ -19,7 +19,7 @@ public function testCompileFile()
                     : (method_exists($base, $method = "get" . ucfirst($key))
                         ? $base->$method()
                         : (method_exists($base, $key)
-                            ? $base->$key()
+                            ? array($base, $key)
                             : null
                         )
                     )
@@ -68,7 +68,7 @@ public function testCompileFile()
                     : (method_exists($base, $method = "get" . ucfirst($key))
                         ? $base->$method()
                         : (method_exists($base, $key)
-                            ? $base->$key()
+                            ? array($base, $key)
                             : null
                         )
                     )
@@ -176,7 +176,7 @@ public function testCompileSource()
                     : (method_exists($base, $method = "get" . ucfirst($key))
                         ? $base->$method()
                         : (method_exists($base, $key)
-                            ? $base->$key()
+                            ? array($base, $key)
                             : null
                         )
                     )