Skip linenum increment for indented code blocks #599
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
An indented code block would cause the subsequent all subsequent code
block line numbers (including its own) to be out by one.
For example, the following would cause the line number for the `BEGIN`
code block to have the line number for the `warning` code block. This
would also affect the code in the final section after the second `%%`.
%%
yyflexdebug = 0;
grab_frame = GRAB_FRAME;
grab_other = GRAB_OTHER;
grab_write = GRAB_WRITE;
yylval->pointer = 0;// ensure pointer vals are null
"/*" { BEGIN (COMMENT); }
<COMMENT>"/*" { warning (0, "nested /* in comment"); }
|
This should have a test case to detect regression in the future. Is that someting you're able to add? |
|
Sure, I'll look into that. |
This checks the line numbers in multiple places, so it should help keep line numbers working in general.
|
Done. I covered as many places as I could think of, and I verified that it does catch the incorrect lines before the patch. |
|
What do you think about having the lexer be generated from something that e.g. grep -n 's the line numbers so that changing the source is less prone to break the test? |
|
Oh, hmm, I hadn't thought of that. Interesting idea. I'll see what I can come up with, but generation certainly makes sense. |
This makes the test much less fragile as now all that is need is for @line@ and __LINE__ to be on the same line (the comment gets substituted too, but it's a comment...)
|
I came up with something that works nicely so long as the two ( |
I had forgotten about distcheck
|
@westes are there any further issues? |
|
This looks great; thank you! |
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.
An indented code block would cause the subsequent all subsequent code block line numbers (including its own) to be out by one.
For example, the following would cause the line number for the
BEGINcode block to have the line number for thewarningcode block. This would also affect the code in the final section after the second%%.