fix: ast for constants

Author: alexander-akait

src/ast.js

@@ -14,6 +14,7 @@ const Position = require("./ast/position");
  * - [Location](#location)
  * - [Position](#position)
  * - [Node](#node)
+ *   - [Constant](#constant)
  *   - [Identifier](#identifier)
  *   - [Reference](#reference)
  *     - [TypeReference](#classreference)
@@ -67,6 +68,8 @@ const Position = require("./ast/position");
  *       - [Nowdoc](#nowdoc)
  *       - [Encapsed](#encapsed)
  *   - [Statement](#statement)
+ *     - [ConstantStatement](#constantstatement)
+ *       - [ClassConstant](#classconstant)
  *     - [Return](#return)
  *     - [Label](#label)
  *     - [Continue](#continue)
@@ -98,8 +101,6 @@ const Position = require("./ast/position");
  *       - [Class](#class)
  *       - [Interface](#interface)
  *       - [Trait](#trait)
- *       - [Constant](#constant)
- *         - [ClassConstant](#classconstant)
  *       - [Function](#function)
  *         - [Method](#method)
  *       - [Parameter](#parameter)
@@ -359,6 +360,7 @@ AST.prototype.prepare = function(kind, docs, parser) {
   require("./ast/commentblock"),
   require("./ast/commentline"),
   require("./ast/constant"),
+  require("./ast/constantstatement"),
   require("./ast/continue"),
   require("./ast/declaration"),
   require("./ast/declare"),

src/ast/classconstant.js

@@ -5,24 +5,48 @@
  */
 "use strict";
 
-const Constant = require("./constant");
+const ConstantStatement = require("./constantstatement");
 const KIND = "classconstant";
 
+const IS_UNDEFINED = "";
+const IS_PUBLIC = "public";
+const IS_PROTECTED = "protected";
+const IS_PRIVATE = "private";
+
 /**
  * Defines a class/interface/trait constant
  * @constructor ClassConstant
- * @extends {Constant}
- * @property {boolean} isStatic
+ * @extends {ConstantStatement}
  * @property {string} visibility
  */
-module.exports = Constant.extends(KIND, function ClassConstant(
-  name,
-  value,
+const ClassConstant = ConstantStatement.extends(KIND, function ClassConstant(
+  kind,
+  items,
   flags,
   docs,
   location
 ) {
-  Constant.apply(this, [name, value, docs, location]);
-  this.kind = KIND;
+  ConstantStatement.apply(this, [kind || KIND, items, docs, location]);
   this.parseFlags(flags);
 });
+
+/**
+ * Generic flags parser
+ * @param {Integer[]} flags
+ * @return {void}
+ */
+ClassConstant.prototype.parseFlags = function(flags) {
+  if (flags[0] === -1) {
+    this.visibility = IS_UNDEFINED;
+  } else if (flags[0] === null) {
+    this.visibility = null;
+  } else if (flags[0] === 0) {
+    this.visibility = IS_PUBLIC;
+  } else if (flags[0] === 1) {
+    this.visibility = IS_PROTECTED;
+  } else if (flags[0] === 2) {
+    this.visibility = IS_PRIVATE;
+  }
+};
+
+module.exports = ClassConstant;

src/ast/constant.js

@@ -5,21 +5,23 @@
  */
 "use strict";
 
-const Declaration = require("./declaration");
+const Node = require("./node");
 const KIND = "constant";
 
 /**
- * Defines a namespace constant
+ * Defines a constant
  * @constructor Constant
- * @extends {Declaration}
- * @property {Node|null} value
+ * @extends {Node}
+ * @property {string} name
+ * @property {Node|string|number|boolean|null} value
  */
-module.exports = Declaration.extends(KIND, function Constant(
+module.exports = Node.extends(KIND, function Constant(
   name,
   value,
   docs,
   location
 ) {
-  Declaration.apply(this, [KIND, name, docs, location]);
+  Node.apply(this, [KIND, docs, location]);
+  this.name = name;
   this.value = value;
 });

src/ast/constantstatement.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2018 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+const Statement = require("./statement");
+const KIND = "constantstatement";
+
+/**
+ * Declares a constants into the current scope
+ * @constructor ConstantStatement
+ * @extends {Statement}
+ * @property {Constant[]} items
+ */
+module.exports = Statement.extends(KIND, function ConstantStatement(
+  kind,
+  items,
+  docs,
+  location
+) {
+  Statement.apply(this, [kind || KIND, docs, location]);
+  this.items = items;
+});

src/parser/class.js

@@ -165,7 +165,8 @@ module.exports = {
     if (this.expect(this.tok.T_CONST)) {
       this.next();
     }
-    return this.read_list(
+    const result = this.node("classconstant");
+    const items = this.read_list(
       /**
        * Reads a constant declaration
        *
@@ -175,7 +176,7 @@ module.exports = {
        * @return {Constant} [:link:](AST.md#constant)
        */
       function read_constant_declaration() {
-        const result = this.node("classconstant");
+        const result = this.node("constant");
         let name = null;
         let value = null;
         if (
@@ -190,10 +191,12 @@ module.exports = {
         if (this.expect("=")) {
           value = this.next().read_expr();
         }
-        return result(name, value, flags);
+        return result(name, value);
       },
       ","
     );
+
+    return result(null, items, flags);
   },
   /**
    * Read member flags

src/parser/statement.js

@@ -51,8 +51,12 @@ module.exports = {
         return this.read_trait();
       case this.tok.T_USE:
         return this.read_use_statement();
-      case this.tok.T_CONST:
-        return this.next().read_const_list();
+      case this.tok.T_CONST: {
+        const result = this.node("constantstatement");
+        const items = this.next().read_const_list();
+        this.expectEndOfStatement();
+        return result(null, items);
+      }
       case this.tok.T_NAMESPACE:
         return this.read_namespace();
       case this.tok.T_HALT_COMPILER: {
@@ -109,7 +113,6 @@ module.exports = {
       ",",
       false
     );
-    this.expectEndOfStatement();
     return result;
   },
   /**