outputs attrs in AST of classes, methods & method params.

Author: cseufert

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_declaration_statement: function () {
+ read_class_declaration_statement: function (attrs) {
  const result = this.node("class");
  const flag = this.read_class_modifiers();
  // graceful mode : ignore token & go next
@@ -30,7 +30,9 @@ module.exports = {
  const propImplements = this.read_implements_list();
  this.expect("{");
  const body = this.next().read_class_body();
- return result(propName, propExtends, propImplements, body, flag);
+ const node = result(propName, propExtends, propImplements, body, flag);
+ if (attrs) node.attrs = attrs;
+ return node;
  },
 
  read_class_modifiers: function () {
@@ -59,7 +61,7 @@ module.exports = {
  */
  read_class_body: function () {
  let result = [];
-
+ let attrs = [];
  while (this.token !== this.EOF && this.token !== "}") {
  if (this.token === this.tok.T_COMMENT) {
  result.push(this.read_comment());
@@ -77,6 +79,9 @@ module.exports = {
  continue;
  }
 
+ if (this.token === this.tok.T_ATTRIBUTE) {
+ attrs = this.read_attr_list();
+ }
  // read member flags
  const flags = this.read_member_flags(false);
 
@@ -99,7 +104,7 @@ module.exports = {
 
  if (this.token === this.tok.T_FUNCTION) {
  // reads a function
- result.push(this.read_function(false, flags));
+ result.push(this.read_function(false, flags, attrs));
  } else if (
  this.token === this.tok.T_VARIABLE ||
  // support https://wiki.php.net/rfc/typed_properties_v2

src/parser/expr.js

@@ -663,6 +663,37 @@ module.exports = {
  return conds;
  },
 
+ read_attribute() {
+ if (this.expect(this.tok.T_ATTRIBUTE)) {
+ this.next();
+ }
+ const name = this.text();
+ let args = [];
+ this.next();
+ if (this.token === "(") {
+ args = this.read_argument_list();
+ }
+ return this.node("attribute")(name, args);
+ },
+ read_attr_list() {
+ const list = [];
+ let more = true;
+ while (more) {
+ list.push(this.read_attribute());
+ if (this.token === ",") this.next();
+ if (this.token === "]") {
+ this.next();
+ }
+ if (this.token === this.tok.T_ATTRIBUTE) {
+ // this.next();
+ more = true;
+ } else {
+ more = false;
+ }
+ }
+ return list;
+ },
+
  /**
  * ```ebnf
  * new_expr ::= T_NEW (namespace_name function_argument_list) | (T_CLASS ... class declaration)

src/parser/function.js

@@ -32,7 +32,7 @@ module.exports = {
  * function ::= function_declaration code_block
  * ```
  */
- read_function: function (closure, flag) {
+ read_function: function (closure, flag, attrs) {
  const result = this.read_function_declaration(
  closure ? 1 : flag ? 2 : 0,
  flag && flag[1] === 1
@@ -54,6 +54,7 @@ module.exports = {
  result.parseFlags(flag);
  }
  }
+ if (attrs) result.attrs = attrs;
  return result;
  },
  /**
@@ -204,6 +205,8 @@ module.exports = {
  let value = null;
  let types = null;
  let nullable = false;
+ let attrs = [];
+ if (this.token === this.tok.T_ATTRIBUTE) attrs = this.read_attr_list();
  if (this.token === "?") {
  this.next();
  nullable = true;
@@ -226,7 +229,7 @@ module.exports = {
  if (this.token == "=") {
  value = this.next().read_expr();
  }
- return node(
+ const result = node(
  parameterName,
  types,
  value,
@@ -235,6 +238,8 @@ module.exports = {
  nullable,
  flags
  );
+ if (attrs) result.attrs = attrs;
+ return result;
  },
  read_types() {
  const types = [];

src/parser/statement.js

@@ -37,14 +37,18 @@ module.exports = {
  * ```
  */
  read_top_statement: function () {
+ let attrs = [];
+ if (this.token === this.tok.T_ATTRIBUTE) {
+ attrs = this.read_attr_list();
+ }
  switch (this.token) {
  case this.tok.T_FUNCTION:
  return this.read_function(false, false);
  // optional flags
  case this.tok.T_ABSTRACT:
  case this.tok.T_FINAL:
  case this.tok.T_CLASS:
- return this.read_class_declaration_statement();
+ return this.read_class_declaration_statement(attrs);
  case this.tok.T_INTERFACE:
  return this.read_interface_declaration_statement();
  case this.tok.T_TRAIT:

test/snapshot/attributes.test.js

@@ -5,14 +5,14 @@ describe("Parse Attributes", () => {
  expect(
  parser.parseEval(`
  #[Deprecated]
+ #[replace("use NewClass")]
  class DepClass {}
  `)
  ).toMatchSnapshot();
  });
  it("can parse method attributes", () => {
  expect(
  parser.parseEval(`
- 
  class Test {
  #[Pure]
  function m() {}