glayzzle#95 checking identifier at the end

Author: ichiriac

src/parser/class.js

@@ -412,10 +412,12 @@ module.exports = {
       if (this.token === this.tok.T_DOUBLE_COLON) {
         this.next();
 
-        if (this.is('IDENTIFIER') || this.expect(this.tok.T_STRING)) {
+        if (this.token === this.tok.T_STRING || this.is('IDENTIFIER')) {
           trait = method;
           method = this.text();
           this.next();
+        } else {
+          this.expect(this.tok.T_STRING);
         }
       } else {
         // convert identifier as string
@@ -440,7 +442,7 @@ module.exports = {
         flags = this.read_member_flags();
       }
 
-      if (this.is('IDENTIFIER') || this.token === this.tok.T_STRING) {
+      if (this.token === this.tok.T_STRING || this.is('IDENTIFIER')) {
         alias = this.text();
         this.next();
       } else if (flags === false) {

src/parser/function.js

@@ -10,7 +10,7 @@ module.exports = {
    */
   is_reference: function() {
     if (this.token == '&') {
-      this.next();
+      this.next().ignoreComments();
       return true;
     }
     return false;
@@ -20,7 +20,7 @@ module.exports = {
    */
   ,is_variadic: function() {
     if (this.token === this.tok.T_ELLIPSIS) {
-      this.next();
+      this.next().ignoreComments();
       return true;
     }
     return false;
@@ -71,16 +71,23 @@ module.exports = {
     var result = this.node(nodeName);
 
     if (this.expect(this.tok.T_FUNCTION)) {
-      this.next();
+      this.next().ignoreComments();
     }
     var isRef = this.is_reference();
     var name = false, use = [], returnType = null, nullable = false;
     if (type !== 1) {
-      if ((type === 2 && this.is('IDENTIFIER')) || this.expect(this.tok.T_STRING)) {
-        name = this.text();
-        this.next();
+      if (type === 2) {
+        if (this.token === this.tok.T_STRING || this.is('IDENTIFIER')) {
+          name = this.text();
+          this.next();
+        } else {
+          this.error('IDENTIFIER');
+        }
       } else {
-        this.next();
+        if (this.expect(this.tok.T_STRING)) {
+          name = this.text();
+        }
+        this.next();  
       }
     }
     if (this.expect('(')) this.next();

src/parser/variable.js

@@ -76,8 +76,9 @@ module.exports = {
     if (this.next().is([this.tok.T_VARIABLE, '$'])) {
       offset = this.read_reference_variable(encapsed, false);
     } else if (
-      this.is('IDENTIFIER') || this.token === this.tok.T_STRING
-      || this.token === this.tok.T_CLASS
+      this.token === this.tok.T_STRING
+      || this.token === this.tok.T_CLASS 
+      || this.is('IDENTIFIER')
     ) {
       offset = this.node('constref');
       var name = this.text();

test/commentTests.js

@@ -65,7 +65,7 @@ describe('Test comments', function() {
       '/**',
       ' * Description',
       ' */',
-      'function /* ignore */ name(/* */ $arg) {',
+      'function /* ignore */ & /* ignore */ name(/* */ $arg) {',
       '// inner',
       'return $arg /* ignore */;',
       '}'