glayzzle#171 - export cast node generator as a function in order to make it extensible

Author: ichiriac

src/parser/expr.js

@@ -85,6 +85,13 @@ module.exports = {
     return expr;
   },
 
+  /**
+   * Reads a cast expression
+   */
+  read_expr_cast: function(type) {
+    return this.node("cast")(type, this.text(), this.next().read_expr());
+  },
+
   /**
    * ```ebnf
    * Reads an expression
@@ -246,33 +253,27 @@ module.exports = {
         return result(expr);
 
       case this.tok.T_INT_CAST:
-        return this.node("cast")("int", this.text(), this.next().read_expr());
+        return this.read_expr_cast("int");
 
       case this.tok.T_DOUBLE_CAST:
-        return this.node("cast")("float", this.text(), this.next().read_expr());
+        return this.read_expr_cast("float");
 
       case this.tok.T_STRING_CAST:
-        return this.node("cast")(
-          this.text().indexOf("binary") !== -1 ? "binary" : "string",
-          this.text(),
-          this.next().read_expr()
+        return this.read_expr_cast(
+          this.text().indexOf("binary") !== -1 ? "binary" : "string"
         );
 
       case this.tok.T_ARRAY_CAST:
-        return this.node("cast")("array", this.text(), this.next().read_expr());
+        return this.read_expr_cast("array");
 
       case this.tok.T_OBJECT_CAST:
-        return this.node("cast")(
-          "object",
-          this.text(),
-          this.next().read_expr()
-        );
+        return this.read_expr_cast("object");
 
       case this.tok.T_BOOL_CAST:
-        return this.node("cast")("bool", this.text(), this.next().read_expr());
+        return this.read_expr_cast("bool");
 
       case this.tok.T_UNSET_CAST:
-        return this.node("cast")("unset", this.text(), this.next().read_expr());
+        return this.read_expr_cast("unset");
 
       case this.tok.T_EXIT: {
         const useDie = this.lexer.yytext.toLowerCase() === "die";

test/snapshot/__snapshots__/expr.test.js.snap

@@ -618,6 +618,111 @@ Program {
 }
 `;
 
+exports[`Test expressions test cast extension - #171 1`] = `
+Program {
+  "children": Array [
+    Variable {
+      "byref": false,
+      "cast": "int",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(int)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "int",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(integer)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "bool",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(bool)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "bool",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(boolean)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "float",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(float)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "float",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(double)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "float",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(real)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "string",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(string)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "binary",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(binary)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "array",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(array)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "object",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(object)",
+    },
+    Variable {
+      "byref": false,
+      "cast": "unset",
+      "curly": false,
+      "kind": "variable",
+      "name": "var",
+      "rawCast": "(unset)",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`Test expressions test exit 1`] = `
 Program {
   "children": Array [

test/snapshot/expr.test.js

@@ -126,6 +126,37 @@ describe("Test expressions", function() {
     expect(ast).toMatchSnapshot();
   });
 
+
+  it("test cast extension - #171", function() {
+    const ast = parser.parseEval(
+      `
+        (int)$var;
+        (integer)$var;
+        (bool)$var;
+        (boolean)$var;
+        (float)$var;
+        (double)$var;
+        (real)$var;
+        (string)$var;
+        (binary)$var;
+        (array)$var;
+        (object)$var;
+        (unset)$var;
+      `, {
+        parser: {
+          read_expr_cast: function(cast) {
+            const rawCast = this.text();
+            const expr = this.next().read_expr();
+            expr.cast = cast;
+            expr.rawCast = rawCast;
+            return expr;
+          }
+        }
+      }
+    );
+    expect(ast).toMatchSnapshot();
+  });
+
   it("test exit", function() {
     const ast = parser.parseEval(
       `