add static keyword node

Author: ichiriac

docs/AST.md

@@ -44,6 +44,7 @@
         -   [Exit](#exit)
         -   [Clone](#clone)
         -   [Global](#global)
+        -   [Static](#static)
         -   [Include](#include)
         -   [Assign](#assign)
         -   [RetIf](#retif)
@@ -885,6 +886,16 @@ Avoids to show/log warnings & notices from the inner expression
 
 Any statement.
 
+# Static
+
+**Extends Statement**
+
+Declares a static variable into the current scope
+
+**Properties**
+
+-   `items` **([Array](#array)<[Variable](#variable)> | [Array](#array)<[Assign](#assign)>)** 
+
 # StaticLookup
 
 **Extends Lookup**

docs/parser.md

@@ -688,6 +688,24 @@ Sample code :
 
 Returns **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)<Identifier>** 
 
+# read_variable_declarations
+
+Reads a list of variables declarations
+
+```ebnf
+variable_declaration ::= T_VARIABLE ('=' expr)?*
+variable_declarations ::= variable_declaration (',' variable_declaration)*
+```
+
+Sample code :
+
+```php
+<?php class foo extends bar, baz { }
+```
+
+Returns **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)&lt;Variable> | [Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)&lt;Assign>)** Returns an array composed by a list of variables, or
+assign values
+
 # read_variable
 
 Reads a variable

src/ast.js

@@ -50,6 +50,7 @@ var Position = require('./ast/position');
  *     - [Exit](#exit)
  *     - [Clone](#clone)
  *     - [Global](#global)
+ *     - [Static](#static)
  *     - [Include](#include)
  *     - [Assign](#assign)
  *     - [RetIf](#retif)
@@ -229,6 +230,7 @@ AST.prototype.prepare = function(kind, parser) {
   require('./ast/return'),
   require('./ast/shell'),
   require('./ast/silent'),
+  require('./ast/static'),
   require('./ast/staticlookup'),
   require('./ast/string'),
   require('./ast/switch'),

src/ast/static.js

@@ -0,0 +1,21 @@
+/*!
+ * Copyright (C) 2017 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+var Statement = require('./statement');
+var KIND = 'static';
+
+/**
+ * Declares a static variable into the current scope
+ * @constructor Static
+ * @extends {Statement}
+ * @property {Variable[]|Assign[]} items
+ */
+var Static = Statement.extends(function Static(items, location) {
+  Statement.apply(this, [KIND, location]);
+  this.items = items;
+});
+
+module.exports = Static;

src/parser/statement.js

@@ -228,19 +228,9 @@ module.exports = {
           this.expect(';') && this.nextWithComments();
           return expr;
         }
-        var items = this.read_list(function() {
-          var value = null, name = null;
-          if (this.expect(this.tok.T_VARIABLE)) {
-            name = this.text();
-            this.next();
-          }
-          if (this.token === '=') {
-            value = this.next().read_expr();
-          }
-          return [name, value];
-        }, ',');
+        var items = this.read_variable_declarations();
         this.expectEndOfStatement();
-        return result('declare', items);
+        return result(items);
 
       case this.tok.T_ECHO:
         var result = this.node('echo');

src/parser/utils.js

@@ -81,4 +81,40 @@ module.exports = {
     );
   }
 
+  /**
+   * Reads a list of variables declarations
+   *
+   * ```ebnf
+   * variable_declaration ::= T_VARIABLE ('=' expr)?*
+   * variable_declarations ::= variable_declaration (',' variable_declaration)*
+   * ```
+   *
+   * Sample code :
+   * ```php
+   * <?php class foo extends bar, baz { }
+   * ```
+   * @return {Variable[]|Assign[]} Returns an array composed by a list of variables, or
+   * assign values
+   */
+  ,read_variable_declarations: function() {
+    return this.read_list(function() {
+      var node = this.node('assign'),
+        value = null,
+        variable = this.node('variable');
+      // plain variable name
+      if (this.expect(this.tok.T_VARIABLE)) {
+        var name = this.text().substring(1);
+        this.next();
+        variable = variable(name, false);
+      } else {
+        variable = variable('#ERR', false);
+      }
+      if (this.token === '=') {
+        return node(variable, this.next().read_expr());
+      } else {
+        return variable;
+      }
+    }, ',');
+  }
+
 };

test/statementTests.js

@@ -32,6 +32,35 @@ describe('Test statements', function() {
     expr.items[1].name.should.be.exactly('b');
   });
 
+  it('test static', function() {
+    var ast = parser.parseEval([
+      'function foo() {',
+      '  static $a, $b = 5;',
+      '}',
+      'static $sVar1 = 11;'
+    ].join('\n'), {
+      parser: { debug: false }
+    });
+
+    // test function multi statements
+    var expr = ast.children[0].body.children[0];
+    expr.kind.should.be.exactly('static');
+    expr.items.length.should.be.exactly(2);
+    expr.items[0].kind.should.be.exactly('variable');
+    expr.items[1].kind.should.be.exactly('assign');
+
+    // test single statement
+    ast.children[1].kind.should.be.exactly('static');
+    ast.children[1].items.length.should.be.exactly(1);
+    ast.children[1].items[0].kind.should.be.exactly('assign');
+    ast.children[1].items[0].left.kind.should.be.exactly('variable');
+    ast.children[1].items[0].left.name.should.be.exactly('sVar1');
+    ast.children[1].items[0].right.kind.should.be.exactly('number');
+    ast.children[1].items[0].right.value.should.be.exactly('11');
+
+  });
+
+
   it('test try', function() {
     var ast = parser.parseEval([
       'try {',