Handle dyadic operators

Author: kylekatarnls

examples/calcul-vars.js

@@ -0,0 +1,3 @@
+a = 2;
+b = 4;
+a * b;

examples/calcul-vars.php

@@ -0,0 +1,3 @@
+$a = 2;
+$b = 4;
+$a * $b;

src/JsPhpize/Lexer/Token.php

@@ -21,6 +21,26 @@ public function isComparison()
         return in_array($this->type, array('===', '!==', '>=', '<=', '<>', '!=', '==', '>', '<'));
     }
 
+    public function isLogical()
+    {
+        return in_array($this->type, array('&&', '||', '!'));
+    }
+
+    public function isBinary()
+    {
+        return in_array($this->type, array('&', '|', '^', '~', '>>', '<<', '>>>'));
+    }
+
+    public function isArithmetic()
+    {
+        return in_array($this->type, array('+', '-', '/', '*', '%', '**', '--', '++'));
+    }
+
+    public function expectRightMember()
+    {
+        return $this->isArithmetic() || $this->isLogical() || $this->isBinary() || $this->isComparison();
+    }
+
     public function isAssignation()
     {
         return substr($this->type, -1) === '=' && !$this->isComparison();

src/JsPhpize/Nodes/Block.php

@@ -51,6 +51,10 @@ public function let($variable, $prefix)
 
     public function addNodes($nodes)
     {
+        if ($nodes === array('$b')) {
+            throw new \Exception("Error Processing Request", 1);
+
+        }
         $nodes = array_filter(is_array($nodes) ? $nodes : func_get_args());
         $this->nodes = array_merge($this->nodes, $nodes);
     }

src/JsPhpize/Parser/Parser.php

@@ -134,6 +134,20 @@ protected function getCurrentBlock()
         return end($this->stack);
     }
 
+    protected function visitToken($token)
+    {
+        $block = $this->getCurrentBlock();
+        $method = 'visit' . ucfirst($token->type);
+        $token = method_exists($this, $method)
+            ? $this->$method($token)
+            : $this->visitNode($token);
+        if (!is_array($token)) {
+            $token = array($token);
+        }
+
+        return $token;
+    }
+
     public function parseBlock($block)
     {
         $this->stack[] = $block;
@@ -149,14 +163,7 @@ public function parseBlock($block)
             if ($token->type === '}') {
                 return;
             }
-            $method = 'visit' . ucfirst($token->type);
-            $token = method_exists($this, $method)
-                ? $this->$method($token)
-                : $this->visitNode($token);
-            if (!is_array($token)) {
-                $token = array($token);
-            }
-            $block->addNodes($token);
+            $block->addNodes($this->visitToken($token));
         }
         array_pop($this->stack);
     }

src/JsPhpize/Parser/Visitor.php

@@ -100,10 +100,15 @@ protected function visitVariable($token)
             $next = $this->get(0);
             $afterNext = $this->get(1);
         }
-        if (count($variableParts) === 1) {
-            return $variableParts[0];
+        $variable = count($variableParts) === 1
+            ? $variableParts[0]
+            : 'call_user_func(' . $this->getHelper('dot') . ', ' . implode(', ', $variableParts) . ')';
+        while ($next && $next->expectRightMember() && $next->type !== '+') {
+            $this->skip();
+            $variable .= ' ' . $next . ' ' . implode(' ', $this->visitToken($this->next()));
+            $next = $this->current();
         }
 
-        return 'call_user_func(' . $this->getHelper('dot') . ', ' . implode(', ', $variableParts) . ')';
+        return $variable;
     }
 }