Merge fabdd6f into 2c2e63d

glayzzle · Jan 7, 2019 · e5a36fe · e5a36fe
2 parents 2c2e63d + fabdd6f
commit e5a36fe
Show file tree

Hide file tree

Showing 10 changed files with 413 additions and 65 deletions.
diff --git a/src/ast.js b/src/ast.js
@@ -14,7 +14,7 @@ const Position = require("./ast/position");
  * - [Location](#location)
  * - [Position](#position)
  * - [Node](#node)
- *   - [DeclareDirective](#declaredirective)
+ *   - [StaticVariable](#staticvariable)
  *   - [EncapsedPart](#encapsedpart)
  *   - [Constant](#constant)
  *   - [Identifier](#identifier)
@@ -472,6 +472,7 @@ AST.prototype.prepare = function(kind, docs, parser) {
   require("./ast/silent"),
   require("./ast/statement"),
   require("./ast/static"),
+  require("./ast/staticvariable"),
   require("./ast/staticlookup"),
   require("./ast/staticreference"),
   require("./ast/string"),

diff --git a/src/ast/static.js b/src/ast/static.js
@@ -12,13 +12,13 @@ const KIND = "static";
  * Declares a static variable into the current scope
  * @constructor Static
  * @extends {Statement}
- * @property {Variable[]|Assign[]} items
+ * @property {StaticVariable[]} variables
  */
 module.exports = Statement.extends(KIND, function Static(
-  items,
+  variables,
   docs,
   location
 ) {
   Statement.apply(this, [KIND, docs, location]);
-  this.items = items;
+  this.variables = variables;
 });
diff --git a/src/ast/staticvariable.js b/src/ast/staticvariable.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2018 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+const Node = require("./node");
+const KIND = "staticvariable";
+
+/**
+ * Defines a constant
+ * @constructor StaticVariable
+ * @extends {Node}
+ * @property {Variable} variable
+ * @property {Node|string|number|boolean|null} defaultValue
+ */
+module.exports = Node.extends(KIND, function StaticVariable(
+  variable,
+  defaultValue,
+  docs,
+  location
+) {
+  Node.apply(this, [KIND, docs, location]);
+  this.variable = variable;
+  this.defaultValue = defaultValue;
+});
diff --git a/src/parser/utils.js b/src/parser/utils.js
@@ -89,14 +89,14 @@ module.exports = {
    *
    * Sample code :
    * ```php
-   * <?php class foo extends bar, baz { }
+   * <?php static $a = 'hello', $b = 'world';
    * ```
-   * @return {Variable[]|Assign[]} Returns an array composed by a list of variables, or
+   * @return {StaticVariable[]} Returns an array composed by a list of variables, or
    * assign values
    */
   read_variable_declarations: function() {
     return this.read_list(function() {
-      const node = this.node("assign");
+      const node = this.node("staticvariable");
       let variable = this.node("variable");
       // plain variable name
       if (this.expect(this.tok.T_VARIABLE)) {

diff --git a/test/snapshot/__snapshots__/acid.test.js.snap b/test/snapshot/__snapshots__/acid.test.js.snap
@@ -3975,7 +3975,21 @@ next:
               "body": Block {
                 "children": Array [
                   Static {
-                    "items": Array [
+                    "kind": "static",
+                    "loc": Location {
+                      "end": Position {
+                        "column": 19,
+                        "line": 96,
+                        "offset": 1953,
+                      },
+                      "source": "static $banana;",
+                      "start": Position {
+                        "column": 4,
+                        "line": 96,
+                        "offset": 1938,
+                      },
+                    },
+                    "variables": Array [
                       Variable {
                         "byref": false,
                         "curly": false,
@@ -3996,20 +4010,6 @@ next:
                         "name": "banana",
                       },
                     ],
-                    "kind": "static",
-                    "loc": Location {
-                      "end": Position {
-                        "column": 19,
-                        "line": 96,
-                        "offset": 1953,
-                      },
-                      "source": "static $banana;",
-                      "start": Position {
-                        "column": 4,
-                        "line": 96,
-                        "offset": 1938,
-                      },
-                    },
                   },
                   If {
                     "alternate": If {