Record source column positions #193
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
saghul
approved these changes
Dec 11, 2023
quickjs.c
Outdated
| @@ -18271,6 +18295,7 @@ static void free_token(JSParseState *s, JSToken *token) | |||
| static void __attribute((unused)) dump_token(JSParseState *s, | |||
| const JSToken *token) | |||
| { | |||
| printf("%d:%d ", token->line_num, token->col_num); | |||
There was a problem hiding this comment.
Debug leftover or intentional?
There was a problem hiding this comment.
Intentional! And it's a debug helper in the first place.
quickjs.c
Outdated
| @@ -18826,7 +18861,8 @@ static __exception int next_token(JSParseState *s) | |||
| if (*p == '\n') { | |||
| s->line_num++; | |||
| s->got_lf = TRUE; /* considered as LF for ASI */ | |||
| p++; | |||
| s->eol = p++; | |||
There was a problem hiding this comment.
Any chance of simplifying the logic with got_lf now? I didn't look into it but there might be some overlap?
There was a problem hiding this comment.
Not easily, I think. I can go into detail but they mean/describe slightly different things.
And: - display them in stack traces - expose them as Function.prototype.columnNumber OP_line_num is renamed to OP_source_loc and the pc2line data structure is extended with the column number in zigzag encoding. The bytecode version number BC_VERSION is incremented because pc2line data is read and written by JS_ReadObject() and JS_WriteObject() when it is present. Fixes: quickjs-ng#149
Agreed. I'll follow up with another PR. |
bnoordhuis
added a commit
to bnoordhuis/quickjs
that referenced
this pull request
Dec 11, 2023
And merge the debug struct into JSFunctionBytecode because it is now always present. Refs: quickjs-ng#193 (review)
bnoordhuis
added a commit
to bnoordhuis/quickjs
that referenced
this pull request
Dec 11, 2023
And merge the debug struct into JSFunctionBytecode because it is now always present. Refs: quickjs-ng#193 (review)
bnoordhuis
added a commit
that referenced
this pull request
Dec 11, 2023
And merge the debug struct into JSFunctionBytecode because it is now always present. Refs: #193 (review)
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.
And:
OP_line_num is renamed to OP_source_loc and the pc2line data structure is extended with the column number in zigzag encoding.
The bytecode version number BC_VERSION is incremented because pc2line data is read and written by JS_ReadObject() and JS_WriteObject() when it is present.
Fixes: #149