Merge pull request glayzzle#662 from Selion05/issue-658-null-safe-operator

add php8 nullsafe operator

Author: czosel

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '6'
+  - '10'
 cache:
   bundler: true
   directories:

src/ast.js

@@ -522,6 +522,7 @@ AST.prototype.checkNodes = function () {
   require("./ast/noop"),
   require("./ast/nowdoc"),
   require("./ast/nullkeyword"),
+  require("./ast/nullsafepropertylookup"),
   require("./ast/number"),
   require("./ast/offsetlookup"),
   require("./ast/operation"),

src/ast/nullsafepropertylookup.js

@@ -0,0 +1,23 @@
+/**
+ * Copyright (C) 2018 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+const Lookup = require("./lookup");
+const KIND = "nullsafepropertylookup";
+
+/**
+ * Lookup to an object property
+ * @constructor PropertyLookup
+ * @extends {Lookup}
+ */
+module.exports = Lookup.extends(KIND, function PropertyLookup(
+  what,
+  offset,
+  docs,
+  location
+) {
+  Lookup.apply(this, [KIND, what, offset, docs, location]);
+});

src/index.js

@@ -92,8 +92,8 @@ const engine = function (options) {
         } else if (typeof options.parser.version !== "number") {
           throw new Error("Expecting a number for version");
         }
-        if (options.parser.version < 500 || options.parser.version > 704) {
-          throw new Error("Can only handle versions between 5.x to 7.x");
+        if (options.parser.version < 500 || options.parser.version > 900) {
+          throw new Error("Can only handle versions between 5.x to 8.x");
         }
       }
     }

src/lexer.js

@@ -29,7 +29,7 @@ const lexer = function (engine) {
   this.mode_eval = false;
   this.asp_tags = false;
   this.short_tags = false;
-  this.version = 704;
+  this.version = 800;
   this.yyprevcol = 0;
   this.keywords = {
     __class__: this.tok.T_CLASS_C,

src/lexer/tokens.js

@@ -162,6 +162,14 @@ module.exports = {
           return this.tok.T_COALESCE;
         }
       }
+      if (
+        this.version >= 800 &&
+        this._input[this.offset] === "-" &&
+        this._input[this.offset + 1] === ">"
+      ) {
+        this.consume(2);
+        return this.tok.T_NULLSAFE_OBJECT_OPERATOR;
+      }
       return "?";
     },
     "<": function () {

src/parser.js

@@ -33,7 +33,7 @@ const parser = function (lexer, ast) {
   this.token = null;
   this.prev = null;
   this.debug = false;
-  this.version = 704;
+  this.version = 800;
   this.extractDoc = false;
   this.extractTokens = false;
   this.suppressErrors = false;

src/parser/variable.js

@@ -228,6 +228,11 @@ module.exports = {
           result = node(result, this.read_what());
           break;
         }
+        case this.tok.T_NULLSAFE_OBJECT_OPERATOR: {
+          node = this.node("nullsafepropertylookup");
+          result = node(result, this.read_what());
+          break;
+        }
         default:
           break recursive_scan_loop;
       }

src/tokens.js

@@ -146,6 +146,7 @@ module.exports = {
     233: "T_SPACESHIP",
     234: "T_COALESCE_EQUAL",
     235: "T_FN",
+    236: "T_NULLSAFE_OBJECT_OPERATOR",
   },
   names: {
     T_HALT_COMPILER: 101,
@@ -283,5 +284,6 @@ module.exports = {
     T_SPACESHIP: 233,
     T_COALESCE_EQUAL: 234,
     T_FN: 235,
+    T_NULLSAFE_OBJECT_OPERATOR: 236,
   },
 };

test/snapshot/__snapshots__/call.test.js.snap

@@ -793,6 +793,69 @@ Program {
 }
 `;
 
+exports[`Test call nullsafepropertylookup (2) 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Call {
+        "arguments": Array [],
+        "kind": "call",
+        "what": PropertyLookup {
+          "kind": "nullsafepropertylookup",
+          "offset": Identifier {
+            "kind": "identifier",
+            "name": "call",
+          },
+          "what": PropertyLookup {
+            "kind": "nullsafepropertylookup",
+            "offset": Identifier {
+              "kind": "identifier",
+              "name": "property",
+            },
+            "what": Variable {
+              "curly": false,
+              "kind": "variable",
+              "name": "obj",
+            },
+          },
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
+exports[`Test call nullsafepropertylookup 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Call {
+        "arguments": Array [],
+        "kind": "call",
+        "what": PropertyLookup {
+          "kind": "nullsafepropertylookup",
+          "offset": Identifier {
+            "kind": "identifier",
+            "name": "call",
+          },
+          "what": Variable {
+            "curly": false,
+            "kind": "variable",
+            "name": "obj",
+          },
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`Test call offsetlookup 1`] = `
 Program {
   "children": Array [