Merge pull request glayzzle#215 from glayzzle/issue-181

fix: use unary instead negative number

Author: ichiriac

src/parser/expr.js

@@ -106,26 +106,13 @@ module.exports = {
     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 === "-")
+      return this.node("unary")("-", this.next().read_expr());
     if (this.token === "!")
       return this.node("unary")("!", this.next().read_expr());
     if (this.token === "~")
       return this.node("unary")("~", this.next().read_expr());
 
-    if (this.token === "-") {
-      result = this.node();
-      this.next();
-      if (
-        this.token === this.tok.T_LNUMBER ||
-        this.token === this.tok.T_DNUMBER
-      ) {
-        // negative number
-        result = result("number", "-" + this.text(), null);
-        this.next();
-        return result;
-      }
-      return result("unary", "-", this.read_expr());
-    }
-
     if (this.token === "(") {
       expr = this.next().read_expr();
       expr.parenthesizedExpression = true;

test/snapshot/__snapshots__/acid.test.js.snap

@@ -2735,22 +2735,39 @@ Program {
                     },
                   },
                   "operator": "=",
-                  "right": Number {
-                    "kind": "number",
+                  "right": Unary {
+                    "kind": "unary",
                     "loc": Location {
                       "end": Position {
-                        "column": 14,
+                        "column": 15,
                         "line": 82,
-                        "offset": 1657,
+                        "offset": 1658,
                       },
-                      "source": "-",
+                      "source": "-1",
                       "start": Position {
                         "column": 13,
                         "line": 82,
                         "offset": 1656,
                       },
                     },
-                    "value": "-1",
+                    "type": "-",
+                    "what": Number {
+                      "kind": "number",
+                      "loc": Location {
+                        "end": Position {
+                          "column": 15,
+                          "line": 82,
+                          "offset": 1658,
+                        },
+                        "source": "1",
+                        "start": Position {
+                          "column": 14,
+                          "line": 82,
+                          "offset": 1657,
+                        },
+                      },
+                      "value": "1",
+                    },
                   },
                 },
                 "kind": "expressionstatement",

test/snapshot/__snapshots__/ast.test.js.snap

@@ -232,9 +232,13 @@ Program {
     ExpressionStatement {
       "expression": Exit {
         "kind": "exit",
-        "status": Number {
-          "kind": "number",
-          "value": "-1",
+        "status": Unary {
+          "kind": "unary",
+          "type": "-",
+          "what": Number {
+            "kind": "number",
+            "value": "1",
+          },
         },
         "useDie": false,
       },

test/snapshot/__snapshots__/location.test.js.snap

@@ -6171,8 +6171,8 @@ exports[`Test locations negative number 1`] = `
 Program {
   "children": Array [
     ExpressionStatement {
-      "expression": Number {
-        "kind": "number",
+      "expression": Unary {
+        "kind": "unary",
         "loc": Location {
           "end": Position {
             "column": 6,
@@ -6186,7 +6186,24 @@ Program {
             "offset": 0,
           },
         },
-        "value": "-2112",
+        "type": "-",
+        "what": Number {
+          "kind": "number",
+          "loc": Location {
+            "end": Position {
+              "column": 5,
+              "line": 1,
+              "offset": 5,
+            },
+            "source": "2112",
+            "start": Position {
+              "column": 1,
+              "line": 1,
+              "offset": 1,
+            },
+          },
+          "value": "2112",
+        },
       },
       "kind": "expressionstatement",
       "loc": Location {

test/snapshot/__snapshots__/number.test.js.snap

@@ -13,9 +13,13 @@ Program {
           "name": "a",
         },
         "operator": "=",
-        "right": Number {
-          "kind": "number",
-          "value": "-1.5",
+        "right": Unary {
+          "kind": "unary",
+          "type": "-",
+          "what": Number {
+            "kind": "number",
+            "value": "1.5",
+          },
         },
       },
       "kind": "expressionstatement",

test/snapshot/__snapshots__/scalar.test.js.snap

@@ -15,9 +15,13 @@ Program {
         "operator": "=",
         "right": OffsetLookup {
           "kind": "offsetlookup",
-          "offset": Number {
-            "kind": "number",
-            "value": "-5",
+          "offset": Unary {
+            "kind": "unary",
+            "type": "-",
+            "what": Number {
+              "kind": "number",
+              "value": "5",
+            },
           },
           "what": StaticLookup {
             "kind": "staticlookup",