glayzzle#41 - add node types on constants and properties

Author: ichiriac

src/parser/class.js

@@ -192,16 +192,17 @@ module.exports = {
    * </ebnf>
    */
   ,read_variable_declaration: function() {
-    var varName = this.node(this.text());
-    this.expect(this.tok.T_VARIABLE).next();
+    var result = this.node('var');
+    var name = this.expect(this.tok.T_VARIABLE).text();
+    this.next();
     if (this.token === ';' || this.token === ',') {
-      return varName(null);
+      return result(name, null);
     } else if(this.token === '=') {
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L815
-      return varName(this.next().read_expr());
+      return result(name, this.next().read_expr());
     } else {
       this.expect([',', ';', '=']);
-      return varName(null);
+      return result(name, null);
     }
   }
   /**
@@ -225,14 +226,10 @@ module.exports = {
    * </ebnf>
    */
   ,read_constant_declaration: function() {
-    var name = this.node(this.text());
-    var value = this.expect(this.tok.T_STRING)
-      .next()
-      .expect('=')
-      .next()
-      .read_expr()
-    ;
-    return name(value);
+    var result = this.node('const');
+    var name = this.expect(this.tok.T_STRING).text();
+    var value =  this.next().expect('=').next().read_expr();
+    return result(name, value);
   }
   /**
    * Read member flags

test/functional/commentTests.js

@@ -96,17 +96,17 @@ describe('Test comments', function() {
       var body = ast[1][1][5];
       body.properties[0][0].should.be.exactly("comment");
       body.properties[0][1][0].should.be.exactly("// @var test\n");
-      body.properties[0][2][0].should.be.exactly("$test");
+      body.properties[0][2][1].should.be.exactly("$test");
 
       body.properties[1][0].should.be.exactly("comment");
-      body.properties[1][2][0].should.be.exactly("$toto");
+      body.properties[1][2][1].should.be.exactly("$toto");
 
       body.properties[2][0].should.be.exactly("doc")
-      body.properties[2][2][0].should.be.exactly("$foo");
+      body.properties[2][2][1].should.be.exactly("$foo");
 
       body.methods[0][0].should.be.exactly("doc");
       body.methods[0][1].should.be.exactly("/**\n    * @return void\n    */");
-      body.methods[0][2][0].should.be.exactly("function");
+      body.methods[0][2][1].should.be.exactly("void");
     });
   });
 

test/functional/gracefulTests.js

@@ -49,8 +49,8 @@ describe('Test graceful mode', function() {
       ast[1][0][0].should.be.exactly('class');
       ast[1][0][1].should.be.exactly('foo');
       ast[1][0][5].constants.length.should.be.exactly(1);
-      ast[1][0][5].constants[0][0].should.be.exactly('A');
-      ast[1][0][5].constants[0][1][1].should.be.exactly('1');
+      ast[1][0][5].constants[0][1].should.be.exactly('A');
+      ast[1][0][5].constants[0][2][1].should.be.exactly('1');
 
     });