Fix 9068 newlines emcc error #9088
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s on Windows This fixes a patch applied to acorn.js for quoting error-causing text in parse errors (acornjs/acorn#793). Previously it splitted binary data on \n to get lines, which was inconsistent with the rest of the parser and caused excess \r in the error message on Windows. Now it uses the same regex as the rest of acorn.js (e.g. getLineInfo used by error reporting).
yeputons
commented
Jul 26, 2019
| @@ -2769,7 +2769,7 @@ pp$4.raise = function(pos, message) { | |||
| message += " (" + loc.line + ":" + loc.column + ")"; | |||
| // XXX EMSCRIPTEN: add a quote of the error text, point to where | |||
| // https://github.com/acornjs/acorn/pull/793 | |||
| var lines = this.input.split('\n'); | |||
| var lines = this.input.split(lineBreak); | |||
| message = message + '\n' + lines[loc.line - 1] + '\n'; | |||
There was a problem hiding this comment.
Note that this \n goes to the error message string, which is later displayed by Node exception handler. Hence, it's a usual string, not bytes, newlines are transformed automatically.
|
Great find @yeputons! This is totally my fault - this is the local patch we have for acorn. I should have noticed they have a |
yeputons
added a commit
to yeputons/emscripten
that referenced
this pull request
Aug 7, 2019
yeputons
added a commit
to yeputons/emscripten
that referenced
this pull request
Aug 7, 2019
kripken
pushed a commit
that referenced
this pull request
Aug 7, 2019
belraquib
pushed a commit
to belraquib/emscripten
that referenced
this pull request
Dec 23, 2020
* Fix emscripten-core#9068: get rid of malformed newlines in emcc errors on Windows This fixes a patch applied to acorn.js for quoting error-causing text in parse errors (acornjs/acorn#793). Previously it splitted binary data on \n to get lines, which was inconsistent with the rest of the parser and caused excess \r in the error message on Windows. Now it uses the same regex as the rest of acorn.js (e.g. getLineInfo used by error reporting). * Fix emscripten-core#9057 by fixing by emscripten-core#9068
belraquib
pushed a commit
to belraquib/emscripten
that referenced
this pull request
Dec 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a patch applied to
acorn.jsfor quoting error-causing text in parse errors (acornjs/acorn#793). Previously it splitted binary data on\nto get lines, which was inconsistent with the rest of the parser and caused excess\rin the error message on Windows, which caused #9057. Now it uses the same regex as the rest of acorn.js (e.g.getLineInfoused by error reporting).It also fixes #9057 automatically, hence I enabled corresponding test and removed unnecessary change from #9052.
Tests ran on Windows: