refactor: read_class_modifiers

Author: alexander-akait

src/parser/class.js

@@ -14,7 +14,7 @@ module.exports = {
    */
   read_class_declaration_statement: function() {
     const result = this.node("class");
-    const flag = this.read_class_scope();
+    const flag = this.read_class_modifiers();
     // graceful mode : ignore token & go next
     if (this.token !== this.tok.T_CLASS) {
       this.error(this.tok.T_CLASS);
@@ -32,23 +32,25 @@ module.exports = {
     const body = this.next().read_class_body();
     return result(propName, propExtends, propImplements, body, flag);
   },
-  /**
-   * Read the class visibility
-   * ```ebnf
-   *   class_scope ::= (T_FINAL | T_ABSTRACT)?
-   * ```
-   */
-  read_class_scope: function() {
-    const result = this.token;
-    if (result == this.tok.T_FINAL) {
+
+  read_class_modifiers: function() {
+    return [0, 0, this.read_class_modifier()];
+  },
+
+  read_class_modifier: function() {
+    let result = 0;
+
+    if (this.token === this.tok.T_ABSTRACT) {
       this.next();
-      return [0, 0, 2];
-    } else if (result == this.tok.T_ABSTRACT) {
+      return 1;
+    } else if (this.token === this.tok.T_FINAL) {
       this.next();
-      return [0, 0, 1];
+      return 2;
     }
-    return [0, 0, 0];
+
+    return result;
   },
+
   /**
    * Reads a class body
    * ```ebnf

test/snapshot/__snapshots__/class.test.js.snap

@@ -1103,6 +1103,36 @@ Program {
 }
 `;
 
+exports[`Test classes abstract and final 1`] = `
+Program {
+  "children": Array [
+    Class {
+      "body": Array [],
+      "extends": null,
+      "implements": null,
+      "isAbstract": false,
+      "isAnonymous": false,
+      "isFinal": false,
+      "kind": "class",
+      "name": Identifier {
+        "kind": "identifier",
+        "name": "foo",
+      },
+    },
+  ],
+  "errors": Array [
+    Error {
+      "expected": 187,
+      "kind": "error",
+      "line": 1,
+      "message": "Parse Error : syntax error, unexpected 'final' (T_FINAL), expecting T_CLASS on line 1",
+      "token": "'final' (T_FINAL)",
+    },
+  ],
+  "kind": "program",
+}
+`;
+
 exports[`Test classes class name as identifier 1`] = `
 Program {
   "children": Array [
@@ -1146,3 +1176,33 @@ Program {
   "kind": "program",
 }
 `;
+
+exports[`Test classes final and abstract 1`] = `
+Program {
+  "children": Array [
+    Class {
+      "body": Array [],
+      "extends": null,
+      "implements": null,
+      "isAbstract": false,
+      "isAnonymous": false,
+      "isFinal": false,
+      "kind": "class",
+      "name": Identifier {
+        "kind": "identifier",
+        "name": "foo",
+      },
+    },
+  ],
+  "errors": Array [
+    Error {
+      "expected": 187,
+      "kind": "error",
+      "line": 1,
+      "message": "Parse Error : syntax error, unexpected 'abstract' (T_ABSTRACT), expecting T_CLASS on line 1",
+      "token": "'abstract' (T_ABSTRACT)",
+    },
+  ],
+  "kind": "program",
+}
+`;

test/snapshot/class.test.js

@@ -122,7 +122,23 @@ describe("Test classes", function() {
     expect(parser.parseEval("class Foo {}")).toMatchSnapshot();
   });
 
-  it('class name as identifier', function() {
-    expect(parser.parseEval('class A {}')).toMatchSnapshot();
+  it("class name as identifier", function() {
+    expect(parser.parseEval("class A {}")).toMatchSnapshot();
+  });
+
+  it("final and abstract", function() {
+    expect(
+      parser.parseEval(`final abstract class foo {}`, {
+        parser: { suppressErrors: true }
+      })
+    ).toMatchSnapshot();
+  });
+
+  it("abstract and final", function() {
+    expect(
+      parser.parseEval(`abstract final class foo {}`, {
+        parser: { suppressErrors: true }
+      })
+    ).toMatchSnapshot();
   });
 });