added support for attributes on:

- interfaces

Author: cseufert

src/ast/interface.js

@@ -14,15 +14,18 @@ const KIND = "interface";
  * @extends {Declaration}
  * @property {Identifier[]} extends
  * @property {Declaration[]} body
+ * @property {AttrGroup[]} attrGroups
  */
 module.exports = Declaration.extends(KIND, function Interface(
  name,
  ext,
  body,
+ attrGroups,
  docs,
  location
 ) {
  Declaration.apply(this, [KIND, name, docs, location]);
  this.extends = ext;
  this.body = body;
+ this.attrGroups = attrGroups;
 });

src/parser/class.js

@@ -351,7 +351,7 @@ module.exports = {
  * interface ::= T_INTERFACE T_STRING (T_EXTENDS (NAMESPACE_NAME ',')* NAMESPACE_NAME)? '{' INTERFACE_BODY '}'
  * ```
  */
- read_interface_declaration_statement: function () {
+ read_interface_declaration_statement: function (attrs) {
  const result = this.node("interface");
  if (this.token !== this.tok.T_INTERFACE) {
  this.error(this.tok.T_INTERFACE);
@@ -366,7 +366,7 @@ module.exports = {
  const propExtends = this.read_interface_extends_list();
  this.expect("{");
  const body = this.next().read_interface_body();
- return result(propName, propExtends, body);
+ return result(propName, propExtends, body, attrs || []);
  },
  /**
  * Reads an interface body
@@ -401,7 +401,7 @@ module.exports = {
  result = result.concat(constants);
  } else if (this.token === this.tok.T_FUNCTION) {
  // reads a function
- const method = this.read_function_declaration(2, flags);
+ const method = this.read_function_declaration(2, flags, attrs);
  method.parseFlags(flags);
  result.push(method);
  if (this.expect(";")) {

src/parser/function.js

@@ -35,7 +35,8 @@ module.exports = {
  read_function: function (closure, flag, attrs) {
  const result = this.read_function_declaration(
  closure ? 1 : flag ? 2 : 0,
- flag && flag[1] === 1
+ flag && flag[1] === 1,
+ attrs || []
  );
  if (flag && flag[2] == 1) {
  // abstract function :
@@ -54,7 +55,6 @@ module.exports = {
  result.parseFlags(flag);
  }
  }
- if (attrs) result.attrGroups = attrs;
  return result;
  },
  /**
@@ -63,7 +63,7 @@ module.exports = {
  * function_declaration ::= T_FUNCTION '&'? T_STRING '(' parameter_list ')'
  * ```
  */
- read_function_declaration: function (type, isStatic) {
+ read_function_declaration: function (type, isStatic, attrs) {
  let nodeName = "function";
  if (type === 1) {
  nodeName = "closure";
@@ -133,9 +133,13 @@ module.exports = {
  }
  if (type === 1) {
  // closure
- return result(params, isRef, use, returnType, nullable, isStatic);
+ const fnNode = result(params, isRef, use, returnType, nullable, isStatic);
+ fnNode.attrGroups = attrs || [];
+ return fnNode;
  }
- return result(name, params, isRef, returnType, nullable);
+ const fnNode = result(name, params, isRef, returnType, nullable);
+ fnNode.attrGroups = attrs || [];
+ return fnNode;
  },
 
  read_lexical_vars: function () {

src/parser/statement.js

@@ -50,7 +50,7 @@ module.exports = {
  case this.tok.T_CLASS:
  return this.read_class_declaration_statement(attrs);
  case this.tok.T_INTERFACE:
- return this.read_interface_declaration_statement();
+ return this.read_interface_declaration_statement(attrs);
  case this.tok.T_TRAIT:
  return this.read_trait_declaration_statement();
  case this.tok.T_USE:

test/snapshot/__snapshots__/acid.test.js.snap

@@ -1703,6 +1703,7 @@ Program {
  },
  },
  Interface {
+ "attrGroups": Array [],
  "body": Array [
  Method {
  "arguments": Array [],

test/snapshot/__snapshots__/attributes.test.js.snap

@@ -354,6 +354,94 @@ Program {
 }
 `;
 
+exports[`Parse Attributes can parse interface attributes 1`] = `
+Program {
+ "children": Array [
+ Interface {
+ "attrGroups": Array [
+ AttrGroup {
+ "attrs": Array [
+ Attribute {
+ "args": Array [],
+ "kind": "attribute",
+ "name": "A",
+ },
+ ],
+ "kind": "attrgroup",
+ },
+ ],
+ "body": Array [
+ ClassConstant {
+ "attrGroups": Array [
+ AttrGroup {
+ "attrs": Array [
+ Attribute {
+ "args": Array [],
+ "kind": "attribute",
+ "name": "C",
+ },
+ ],
+ "kind": "attrgroup",
+ },
+ ],
+ "constants": Array [
+ Constant {
+ "kind": "constant",
+ "name": Identifier {
+ "kind": "identifier",
+ "name": "D",
+ },
+ "value": Number {
+ "kind": "number",
+ "value": "0",
+ },
+ },
+ ],
+ "kind": "classconstant",
+ "visibility": "",
+ },
+ Method {
+ "arguments": Array [],
+ "attrGroups": Array [
+ AttrGroup {
+ "attrs": Array [
+ Attribute {
+ "args": Array [],
+ "kind": "attribute",
+ "name": "E",
+ },
+ ],
+ "kind": "attrgroup",
+ },
+ ],
+ "body": null,
+ "byref": false,
+ "isAbstract": false,
+ "isFinal": false,
+ "isStatic": false,
+ "kind": "method",
+ "name": Identifier {
+ "kind": "identifier",
+ "name": "f",
+ },
+ "nullable": false,
+ "type": null,
+ "visibility": "public",
+ },
+ ],
+ "extends": null,
+ "kind": "interface",
+ "name": Identifier {
+ "kind": "identifier",
+ "name": "b",
+ },
+ },
+ ],
+ "errors": Array [],
+ "kind": "program",
+}
+`;
+
 exports[`Parse Attributes can parse method attributes 1`] = `
 Program {
  "children": Array [

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

@@ -141,6 +141,7 @@ Program {
  },
  },
  Interface {
+ "attrGroups": Array [],
  "body": Array [
  ClassConstant {
  "attrGroups": Array [],

test/snapshot/__snapshots__/graceful.test.js.snap

@@ -4,6 +4,7 @@ exports[`Test graceful mode to suppress errors interface 1`] = `
 Program {
  "children": Array [
  Interface {
+ "attrGroups": Array [],
  "body": Array [],
  "extends": null,
  "kind": "interface",
@@ -576,6 +577,7 @@ exports[`Test graceful mode to suppress errors test flags 1`] = `
 Program {
  "children": Array [
  Interface {
+ "attrGroups": Array [],
  "body": Array [
  Method {
  "arguments": Array [],

test/snapshot/__snapshots__/interface.test.js.snap

@@ -4,6 +4,7 @@ exports[`interface extends 1`] = `
 Program {
  "children": Array [
  Interface {
+ "attrGroups": Array [],
  "body": Array [],
  "extends": Array [
  Name {
@@ -28,6 +29,7 @@ exports[`interface interface name as identifier 1`] = `
 Program {
  "children": Array [
  Interface {
+ "attrGroups": Array [],
  "body": Array [],
  "extends": null,
  "kind": "interface",
@@ -46,6 +48,7 @@ exports[`interface multiple extends 1`] = `
 Program {
  "children": Array [
  Interface {
+ "attrGroups": Array [],
  "body": Array [],
  "extends": Array [
  Name {

test/snapshot/__snapshots__/location.test.js.snap

@@ -7536,6 +7536,7 @@ exports[`Test locations test interface 1`] = `
 Program {
  "children": Array [
  Interface {
+ "attrGroups": Array [],
  "body": Array [],
  "extends": null,
  "kind": "interface",