fix #355 & #356 - silent node precendence

Author: ichiriac

src/ast.js

@@ -325,15 +325,17 @@ AST.prototype.resolvePrecedence = function(result, parser) {
     }
   } else if (
     result.kind === "silent" &&
-    result.expr.right &&
     !result.expr.parenthesizedExpression
   ) {
+    if (result.expr.kind === 'assign') return result;
     // overall least precedence
-    buffer = result.expr;
-    result.expr = buffer.left;
-    buffer.left = result;
-    this.swapLocations(buffer, buffer.left, buffer.right, parser);
-    result = buffer;
+    if (result.expr.right) {
+      buffer = result.expr;
+      result.expr = buffer.left;
+      buffer.left = result;
+      this.swapLocations(buffer, buffer.left, buffer.right, parser);
+      result = buffer;  
+    }
   }
   return result;
 };

src/parser/expr.js

@@ -8,6 +8,12 @@
 module.exports = {
   read_expr: function(expr) {
     const result = this.node();
+    if (this.token === "@") {
+      if (!expr) {
+        expr = this.next().read_expr();
+      }
+      return result("silent", expr);
+    }
     if (!expr) {
       expr = this.read_expr_item();
     }
@@ -118,7 +124,6 @@ module.exports = {
    */
   read_expr_item: function() {
     let result, expr;
-    if (this.token === "@") return this.node("silent")(this.next().read_expr());
     if (this.token === "+")
       return this.node("unary")("+", this.next().read_expr());
     if (this.token === "-")

test/debug.js

@@ -17,7 +17,7 @@
 const util = require('util');
 const parser = require("../src/index");
 const ast = parser.parseEval(`
-$var->foo_{$bar};
+@$var += 10
 `, { 
     parser: {
       debug: true,

test/precedence.test.js

@@ -4,20 +4,27 @@ var parser = require("./main");
  * Check precedence by using parenthesis on node B
  */
 var checkPrecedence = function(a, b) {
-  if (!a || !b)
+  if (!a && !b)
     return false;
-  for (var k in b) {
+  for (let k in b) {
     if (k === 'parenthesizedExpression') continue;
     if (b.hasOwnProperty(k)) {
       if (!a.hasOwnProperty(k))
-        return false;
-      if (typeof b[k] === "object") {
+        return expect(a).toHaveProperty(k, b[k]);
+      if (typeof b[k] === "object" && b[k] !== null) {
         checkPrecedence(a[k], b[k]);
       } else {
         expect(a[k]).toEqual(b[k]);
       }
     }
   }
+  for (let k in a) {
+    if (k === 'parenthesizedExpression') continue;
+    if (a.hasOwnProperty(k)) {
+      if (!b.hasOwnProperty(k))
+        return expect(b).toHaveProperty(k, a[k]);
+    }
+  }
   return true;
 };
 
@@ -131,6 +138,18 @@ describe("Test precedence", function() {
   it("test silent node / ret if", function() {
     shouldBeSame("@$i == true ? @$foo : @$bar;", "@($i) == true ? @($foo) : @($bar);");
   });
+  it("test silent node - bugfix #355", function() {
+    shouldBeSame(
+      "echo 'pre' . (@$_GET['foo'] === 'bar' ? 'ok' : 'ko') . 'post'", 
+      "echo 'pre' . (@($_GET['foo']) === 'bar' ? 'ok' : 'ko') . 'post'"
+    );
+  });
+  it("test silent node - bugfix #356", function() {
+    shouldBeSame(
+      "@$var += 10", 
+      "@($var += 10)"
+    );
+  });
   it("test silent node / cast", function() {
     shouldBeSame("@(int)$i + 1;", "@((int)$i) + 1;");
   });