Merge pull request glayzzle#213 from glayzzle/fix-location

fix: location

Author: ichiriac

src/parser/class.js

@@ -12,9 +12,15 @@ module.exports = {
    * class ::= class_scope? T_CLASS T_STRING (T_EXTENDS NAMESPACE_NAME)? (T_IMPLEMENTS (NAMESPACE_NAME ',')* NAMESPACE_NAME)? '{' CLASS_BODY '}'
    * ```
    */
-  read_class: function(flag) {
+  read_class: function() {
     const result = this.node("class");
-    this.expect(this.tok.T_CLASS);
+    const flag = this.read_class_scope();
+    // graceful mode : ignore token & go next
+    if (this.token !== this.tok.T_CLASS) {
+      this.error(this.tok.T_CLASS);
+      this.next();
+      return null;
+    }
     this.next().expect(this.tok.T_STRING);
     const propName = this.text();
     let propExtends = null;

src/parser/statement.js

@@ -42,18 +42,9 @@ module.exports = {
         return this.read_function(false, false);
       // optional flags
       case this.tok.T_ABSTRACT:
-      case this.tok.T_FINAL: {
-        const flag = this.read_class_scope();
-        if (this.token === this.tok.T_CLASS) {
-          return this.read_class(flag);
-        } else {
-          this.error(this.tok.T_CLASS);
-          this.next();
-          return null;
-        }
-      }
+      case this.tok.T_FINAL:
       case this.tok.T_CLASS:
-        return this.read_class([0, 0, 0]);
+        return this.read_class();
       case this.tok.T_INTERFACE:
         return this.read_interface();
       case this.tok.T_TRAIT:
@@ -155,19 +146,9 @@ module.exports = {
         return this.read_function(false, false);
       // optional flags
       case this.tok.T_ABSTRACT:
-      case this.tok.T_FINAL: {
-        const flag = this.read_class_scope();
-        if (this.token === this.tok.T_CLASS) {
-          return this.read_class(flag);
-        } else {
-          this.error(this.tok.T_CLASS);
-          // graceful mode : ignore token & go next
-          this.next();
-          return null;
-        }
-      }
+      case this.tok.T_FINAL:
       case this.tok.T_CLASS:
-        return this.read_class([0, 0, 0]);
+        return this.read_class();
       case this.tok.T_INTERFACE:
         return this.read_interface();
       case this.tok.T_TRAIT:
@@ -355,13 +336,13 @@ module.exports = {
         return null;
 
       case this.tok.T_STRING:
+        let result = this.node();
         current = [this.token, this.lexer.getState()];
         label = this.text();
         // AST : https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L457
         if (this.next().token === ":") {
-          result = this.node("label");
           this.next();
-          return result(label);
+          return result("label", label);
         }
 
         // default fallback expr / T_STRING '::' (etc...)

test/snapshot/__snapshots__/acid.test.js.snap

@@ -1360,7 +1360,7 @@ Program {
               "line": 47,
               "offset": 938,
             },
-            "source": "class fooBar implements namespace\\\\fooBaz {
+            "source": "abstract class fooBar implements namespace\\\\fooBaz {
     use Line;
     use foo, bar {
       foo::baz insteadof bar;
@@ -1384,9 +1384,9 @@ Program {
     }
   }",
             "start": Position {
-              "column": 11,
+              "column": 2,
               "line": 25,
-              "offset": 399,
+              "offset": 390,
             },
           },
           "name": "fooBar",
@@ -2776,11 +2776,11 @@ Program {
                     "line": 83,
                     "offset": 1665,
                   },
-                  "source": ":",
+                  "source": "next:",
                   "start": Position {
-                    "column": 4,
+                    "column": 0,
                     "line": 83,
-                    "offset": 1664,
+                    "offset": 1660,
                   },
                 },
                 "name": "next",