fix empty arrays

Author: ichiriac

src/parser/array.js

@@ -20,13 +20,14 @@ module.exports = {
     var items = [];
     var result = this.node(ArrayExpr);
 
-    this.expect([this.tok.T_ARRAY, '[']);
-
-    if (this.token == this.tok.T_ARRAY) {
+    if (this.token === this.tok.T_ARRAY) {
       this.next().expect('(');
+      expect = ')';
     } else {
       shortForm = true;
+      expect = ']';
     }
+
     if (this.next().token != expect) {
       while(this.token != this.EOF) {
         items.push(this.read_array_pair_list());
@@ -38,7 +39,7 @@ module.exports = {
         } else break;
       }
     }
-    this.expect(shortForm ? ']' : ')');
+    this.expect(expect);
     this.next();
     return result(shortForm, items);
   },

src/parser/loops.js

@@ -149,7 +149,7 @@ module.exports = {
         var assignList = this.read_assignment_list();
         if (this.expect(')')) this.next();
         return result(assignList);
-      } else if (this.token === '[') {
+      } else if (this.token === '[' || this.token === this.tok.T_ARRAY) {
         return this.read_array();
       } else {
         return this.read_variable(false, false, false);

test/arrayTests.js

@@ -164,6 +164,11 @@ describe('Array without keys', function() {
   });
 
   describe('mixed tests / coverage', function() {
+    it('test empty array', function() {
+      var ast = parser.parseEval('$a = []; $b = array();');
+      ast.children[0].right.items.length.should.be.exactly(0);
+      ast.children[1].right.items.length.should.be.exactly(0);
+    });
     it('test short form / keys', function() {
       var ast = parser.parseEval('[0 => &$foo, $bar => "foobar"];');
       ast.children[0].items.length.should.be.exactly(2);