Merge pull request #389 from glayzzle/refactor-extends-and-implements

refactor: extends and implements
glayzzle · Aug 31, 2019 · 2cb5e99 · 2cb5e99
2 parents f05e332 + 980cf46
commit 2cb5e99
Show file tree

Hide file tree

Showing 6 changed files with 182 additions and 27 deletions.
diff --git a/src/parser/class.js b/src/parser/class.js
@@ -12,7 +12,7 @@ module.exports = {
    * class ::= class_scope? T_CLASS T_STRING (T_EXTENDS NAMESPACE_NAME)? (T_IMPLEMENTS (NAMESPACE_NAME ',')* NAMESPACE_NAME)? '{' CLASS_BODY '}'
    * ```
    */
-  read_class: function() {
+  read_class_declaration_statement: function() {
     const result = this.node("class");
     const flag = this.read_class_scope();
     // graceful mode : ignore token & go next
@@ -26,14 +26,8 @@ module.exports = {
     const name = this.text();
     this.next();
     propName = propName(name);
-    let propExtends = null;
-    if (this.token == this.tok.T_EXTENDS) {
-      propExtends = this.next().read_namespace_name();
-    }
-    let propImplements = null;
-    if (this.token == this.tok.T_IMPLEMENTS) {
-      propImplements = this.next().read_name_list();
-    }
+    const propExtends = this.read_extends_from();
+    const propImplements = this.read_implements_list();
     this.expect("{");
     const body = this.next().read_class_body();
     return result(propName, propExtends, propImplements, body, flag);
@@ -278,7 +272,7 @@ module.exports = {
    * interface ::= T_INTERFACE T_STRING (T_EXTENDS (NAMESPACE_NAME ',')* NAMESPACE_NAME)? '{' INTERFACE_BODY '}'
    * ```
    */
-  read_interface: function() {
+  read_interface_declaration_statement: function() {
     const result = this.node("interface");
     if (this.token !== this.tok.T_INTERFACE) {
       this.error(this.tok.T_INTERFACE);
@@ -290,10 +284,7 @@ module.exports = {
     const name = this.text();
     this.next();
     propName = propName(name);
-    let propExtends = null;
-    if (this.token === this.tok.T_EXTENDS) {
-      propExtends = this.next().read_name_list();
-    }
+    const propExtends = this.read_interface_extends_list();
     this.expect("{");
     const body = this.next().read_interface_body();
     return result(propName, propExtends, body);

diff --git a/src/parser/expr.js b/src/parser/expr.js
@@ -456,6 +456,7 @@ module.exports = {
     // returns variable | scalar
     return expr;
   },
+
   /**
    * ```ebnf
    *    new_expr ::= T_NEW (namespace_name function_argument_list) | (T_CLASS ... class declaration)
@@ -469,18 +470,12 @@ module.exports = {
     if (this.token === this.tok.T_CLASS) {
       const what = this.node("class");
       // Annonymous class declaration
-      let propExtends = null,
-        propImplements = null,
-        body = null;
       if (this.next().token === "(") {
         args = this.read_function_argument_list();
       }
-      if (this.token == this.tok.T_EXTENDS) {
-        propExtends = this.next().read_namespace_name();
-      }
-      if (this.token == this.tok.T_IMPLEMENTS) {
-        propImplements = this.next().read_name_list();
-      }
+      const propExtends = this.read_extends_from();
+      const propImplements = this.read_implements_list();
+      let body = null;
       if (this.expect("{")) {
         body = this.next().read_class_body();
       }

diff --git a/src/parser/statement.js b/src/parser/statement.js
@@ -44,9 +44,9 @@ module.exports = {
       case this.tok.T_ABSTRACT:
       case this.tok.T_FINAL:
       case this.tok.T_CLASS:
-        return this.read_class();
+        return this.read_class_declaration_statement();
       case this.tok.T_INTERFACE:
-        return this.read_interface();
+        return this.read_interface_declaration_statement();
       case this.tok.T_TRAIT:
         return this.read_trait();
       case this.tok.T_USE:
@@ -157,9 +157,9 @@ module.exports = {
       case this.tok.T_ABSTRACT:
       case this.tok.T_FINAL:
       case this.tok.T_CLASS:
-        return this.read_class();
+        return this.read_class_declaration_statement();
       case this.tok.T_INTERFACE:
-        return this.read_interface();
+        return this.read_interface_declaration_statement();
       case this.tok.T_TRAIT:
         return this.read_trait();
       case this.tok.T_HALT_COMPILER: {

diff --git a/src/parser/utils.js b/src/parser/utils.js
@@ -154,5 +154,38 @@ module.exports = {
         return variable;
       }
     }, ",");
+  },
+
+  /*
+   * Reads class extends
+   */
+  read_extends_from: function() {
+    if (this.token === this.tok.T_EXTENDS) {
+      return this.next().read_namespace_name();
+    }
+
+    return null;
+  },
+
+  /*
+   * Reads interface extends list
+   */
+  read_interface_extends_list: function() {
+    if (this.token === this.tok.T_EXTENDS) {
+      return this.next().read_name_list();
+    }
+
+    return null;
+  },
+
+  /*
+   * Reads implements list
+   */
+  read_implements_list: function() {
+    if (this.token === this.tok.T_IMPLEMENTS) {
+      return this.next().read_name_list();
+    }
+
+    return null;
   }
 };
diff --git a/test/snapshot/__snapshots__/new.test.js.snap b/test/snapshot/__snapshots__/new.test.js.snap
@@ -65,6 +65,133 @@ Program {
 }
 `;
 
+exports[`new anonymous class #2 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Assign {
+        "kind": "assign",
+        "left": Variable {
+          "curly": false,
+          "kind": "variable",
+          "name": "var",
+        },
+        "operator": "=",
+        "right": New {
+          "arguments": Array [
+            Variable {
+              "curly": false,
+              "kind": "variable",
+              "name": "var",
+            },
+          ],
+          "kind": "new",
+          "what": Class {
+            "body": Array [],
+            "extends": null,
+            "implements": null,
+            "isAbstract": false,
+            "isAnonymous": true,
+            "isFinal": false,
+            "kind": "class",
+            "name": null,
+          },
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
+exports[`new anonymous class #3 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Assign {
+        "kind": "assign",
+        "left": Variable {
+          "curly": false,
+          "kind": "variable",
+          "name": "var",
+        },
+        "operator": "=",
+        "right": New {
+          "arguments": Array [
+            Variable {
+              "curly": false,
+              "kind": "variable",
+              "name": "var",
+            },
+          ],
+          "kind": "new",
+          "what": Class {
+            "body": Array [],
+            "extends": ClassReference {
+              "kind": "classreference",
+              "name": "SomeClass",
+              "resolution": "uqn",
+            },
+            "implements": Array [
+              ClassReference {
+                "kind": "classreference",
+                "name": "SomeInterface",
+                "resolution": "uqn",
+              },
+            ],
+            "isAbstract": false,
+            "isAnonymous": true,
+            "isFinal": false,
+            "kind": "class",
+            "name": null,
+          },
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
+exports[`new anonymous class 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Assign {
+        "kind": "assign",
+        "left": Variable {
+          "curly": false,
+          "kind": "variable",
+          "name": "var",
+        },
+        "operator": "=",
+        "right": New {
+          "arguments": Array [],
+          "kind": "new",
+          "what": Class {
+            "body": Array [],
+            "extends": null,
+            "implements": null,
+            "isAbstract": false,
+            "isAnonymous": true,
+            "isFinal": false,
+            "kind": "class",
+            "name": null,
+          },
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`new anonymous no parens 1`] = `
 Program {
   "children": Array [

diff --git a/test/snapshot/new.test.js b/test/snapshot/new.test.js
@@ -47,4 +47,13 @@ describe("new", function() {
   it("static", function() {
     expect(parser.parseEval('new static();')).toMatchSnapshot();
   });
+  it("anonymous class", function() {
+    expect(parser.parseEval('$var = new class {};')).toMatchSnapshot();
+  });
+  it("anonymous class #2", function() {
+    expect(parser.parseEval('$var = new class($var) {};')).toMatchSnapshot();
+  });
+  it("anonymous class #3", function() {
+    expect(parser.parseEval('$var = new class($var) extends SomeClass implements SomeInterface {};')).toMatchSnapshot();
+  });
 });