fix: location

Author: alexander-akait

src/parser/loops.js

@@ -16,6 +16,7 @@ module.exports = {
    */
   read_while: function() {
     const result = this.node("while");
+    this.expect(this.tok.T_WHILE) && this.next();
     let test = null;
     let body = null;
     let shortForm = false;
@@ -40,6 +41,7 @@ module.exports = {
    */
   read_do: function() {
     const result = this.node("do");
+    this.expect(this.tok.T_DO) && this.next();
     let test = null;
     let body = null;
     body = this.read_statement();
@@ -63,6 +65,7 @@ module.exports = {
    */
   read_for: function() {
     const result = this.node("for");
+    this.expect(this.tok.T_FOR) && this.next();
     let init = [];
     let test = [];
     let increment = [];
@@ -105,6 +108,7 @@ module.exports = {
    */
   read_foreach: function() {
     const result = this.node("foreach");
+    this.expect(this.tok.T_FOREACH) && this.next();
     let source = null;
     let key = null;
     let value = null;

src/parser/statement.js

@@ -204,16 +204,16 @@ module.exports = {
         return this.read_switch();
 
       case this.tok.T_FOR:
-        return this.next().read_for();
+        return this.read_for();
 
       case this.tok.T_FOREACH:
-        return this.next().read_foreach();
+        return this.read_foreach();
 
       case this.tok.T_WHILE:
-        return this.next().read_while();
+        return this.read_while();
 
       case this.tok.T_DO:
-        return this.next().read_do();
+        return this.read_do();
 
       case this.tok.T_COMMENT:
         return this.read_comment();

src/parser/switch.js

@@ -15,8 +15,8 @@ module.exports = {
    * @see http://php.net/manual/en/control-structures.switch.php
    */
   read_switch: function() {
-    this.expect(this.tok.T_SWITCH) && this.next();
     const result = this.node("switch");
+    this.expect(this.tok.T_SWITCH) && this.next();
     this.expect("(") && this.next();
     const test = this.read_expr();
     this.expect(")") && this.next();

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

@@ -1065,14 +1065,14 @@ Program {
                         "line": 44,
                         "offset": 887,
                       },
-                      "source": "($this->dwarf as $name => $greeting) {
+                      "source": "foreach($this->dwarf as $name => $greeting) {
         echo \\"Hey ho $name, $greeting !\\";
         continue $foo;
       }",
                       "start": Position {
-                        "column": 13,
+                        "column": 6,
                         "line": 41,
-                        "offset": 776,
+                        "offset": 769,
                       },
                     },
                     "shortForm": false,
@@ -2228,7 +2228,7 @@ Program {
                         "line": 70,
                         "offset": 1450,
                       },
-                      "source": "($this->style) {
+                      "source": "switch($this->style) {
         case 'dot':
         case 'point':
           $body = '......';
@@ -2238,9 +2238,9 @@ Program {
           break;
       }",
                       "start": Position {
-                        "column": 12,
+                        "column": 6,
                         "line": 62,
-                        "offset": 1278,
+                        "offset": 1272,
                       },
                     },
                     "shortForm": false,
@@ -4328,14 +4328,14 @@ next:
                                 "line": 126,
                                 "offset": 2773,
                               },
-                              "source": "($i = 0; $i < count($this->banana); $i++) {
+                              "source": "for($i = 0; $i < count($this->banana); $i++) {
         $x %= ($i * 2) / ($i - 1);
         $what = $this->$x[++$i] ? 'yes!': 'noo!';
       }",
                               "start": Position {
-                                "column": 9,
+                                "column": 6,
                                 "line": 123,
-                                "offset": 2637,
+                                "offset": 2634,
                               },
                             },
                             "shortForm": false,
@@ -5872,15 +5872,15 @@ next:
                               "line": 102,
                               "offset": 2111,
                             },
-                            "source": "($bar) {
+                            "source": "while($bar) {
         if ((int)calculateMeaningOfLife() === 42) {
           break foo;
         } else continue;
       }",
                             "start": Position {
-                              "column": 11,
+                              "column": 6,
                               "line": 98,
-                              "offset": 1997,
+                              "offset": 1992,
                             },
                           },
                           "shortForm": false,
@@ -5956,15 +5956,15 @@ next:
                               "line": 107,
                               "offset": 2196,
                             },
-                            "source": "{
+                            "source": "do {
         ?>
         Caesar: here I was
         <?php
       } while(false);",
                             "start": Position {
-                              "column": 9,
+                              "column": 6,
                               "line": 103,
-                              "offset": 2121,
+                              "offset": 2118,
                             },
                           },
                           "test": Boolean {