Merge pull request #961 from glayzzle/support-php81-explicit-octals

Implement parsing of PHP 8.1's explicit octals

Author: czosel

src/lexer/numbers.js

@@ -35,7 +35,13 @@ module.exports = {
         } else {
           this.unput(ch ? 2 : 1);
         }
-        // @fixme check octal notation ? not usefull
+      } else if (ch === "o" || ch === "O") {
+        ch = this.input();
+        if (ch !== "_" && this.is_OCTAL()) {
+          return this.consume_ONUM();
+        } else {
+          this.unput(ch ? 2 : 1);
+        }
       } else if (!this.is_NUM()) {
         if (ch) this.unput(1);
       }
@@ -151,4 +157,15 @@ module.exports = {
     }
     return this.tok.T_LNUMBER;
   },
+  // read an octal number
+  consume_ONUM: function () {
+    while (this.offset < this.size) {
+      const ch = this.input();
+      if (!this.is_OCTAL()) {
+        if (ch) this.unput(1);
+        break;
+      }
+    }
+    return this.tok.T_LNUMBER;
+  },
 };

src/lexer/utils.js

@@ -99,4 +99,14 @@ module.exports = {
     // else
     return false;
   },
+  // check if current char can be an octal number
+  is_OCTAL: function () {
+    const ch = this._input.charCodeAt(this.offset - 1);
+    // 0 - 7
+    if (ch > 47 && ch < 56) return true;
+    // _ (code 95)
+    if (ch === 95) return true;
+    // else
+    return false;
+  },
 };

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

@@ -1,5 +1,63 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Test scalar statements implicit octal 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Assign {
+        "kind": "assign",
+        "left": Variable {
+          "curly": false,
+          "kind": "variable",
+          "name": "var",
+        },
+        "operator": "=",
+        "right": Number {
+          "kind": "number",
+          "value": "0123",
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
+exports[`Test scalar statements php 8.1 explicit octal 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Assign {
+        "kind": "assign",
+        "left": Variable {
+          "curly": false,
+          "kind": "variable",
+          "name": "var",
+        },
+        "operator": "=",
+        "right": Bin {
+          "kind": "bin",
+          "left": Number {
+            "kind": "number",
+            "value": "0o123",
+          },
+          "right": Number {
+            "kind": "number",
+            "value": "0o001_234",
+          },
+          "type": "+",
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`Test scalar statements test constants #2 1`] = `
 Program {
   "children": Array [

test/snapshot/scalar.test.js

@@ -17,6 +17,8 @@ describe("Test scalar statements", function () {
     ["test dereferencable_scalar", "$var = array(1);"],
     ["test dereferencable_scalar #2", "$var = [1];"],
     ["test dereferencable_scalar #3", '$var = "test";'],
+    ["php 8.1 explicit octal", "$var = 0o123 + 0o001_234;"],
+    ["implicit octal", "$var = 0123;"],
   ])("%s", function (_, code) {
     expect(parser.parseEval(code)).toMatchSnapshot();
   });