Merge fcbe56e into 6e63a00

glayzzle · Aug 27, 2019 · 5d8a545 · 5d8a545
2 parents 6e63a00 + fcbe56e
commit 5d8a545
Show file tree

Hide file tree

Showing 10 changed files with 934 additions and 23 deletions.
diff --git a/src/ast.js b/src/ast.js
@@ -323,18 +323,15 @@ AST.prototype.resolvePrecedence = function(result, parser) {
         result = buffer;
       }
     }
-  } else if (
-    result.kind === "silent" &&
-    !result.expr.parenthesizedExpression
-  ) {
-    if (result.expr.kind === 'assign') return result;
+  } else if (result.kind === "silent" && !result.expr.parenthesizedExpression) {
+    if (result.expr.kind === "assign") return result;
     // overall least precedence
     if (result.expr.right) {
       buffer = result.expr;
       result.expr = buffer.left;
       buffer.left = result;
       this.swapLocations(buffer, buffer.left, buffer.right, parser);
-      result = buffer;  
+      result = buffer;
     }
   }
   return result;

diff --git a/src/parser/scalar.js b/src/parser/scalar.js
@@ -96,11 +96,11 @@ module.exports = {
               value = value.substring(0, value.length - 1);
             }
             this.expect(this.tok.T_ENCAPSED_AND_WHITESPACE) && this.next();
+            this.expect(this.tok.T_END_HEREDOC) && this.next();
             const raw = this.lexer._input.substring(
               start,
-              this.lexer.yylloc.last_offset
+              this.lexer.yylloc.first_offset
             );
-            this.expect(this.tok.T_END_HEREDOC) && this.next();
             node = node(
               value,
               raw,

diff --git a/test/snapshot/__snapshots__/acid.test.js.snap b/test/snapshot/__snapshots__/acid.test.js.snap
@@ -7565,15 +7565,6 @@ BAR",
                   "raw": "<<<'BAR'
   $foo + $bar
 BAR
-));
-  eval(<<<FOO
-  return 'This is madness!';
-FOO
-);
-
-}
-__halt_compiler();
-THE END ...
 ",
                   "value": "  $foo + $bar",
                 },