Fix processing of nested entities (fixes #613) #654
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
hartwork
force-pushed
the
issue-613-fix-processing-of-nested-entities
branch
from
9311d1e
to
fb4fb6f
Compare
|
@hartwork asked for a review again. The first commit simplifying the control flow looks like it is just for human readability. A competent compiler doing any optimisation at all ought to be making the same decisions. Still, improving human readability is a good thing, so that gets a 👍 from me. The fix itself makes perfect sense, and is nicely commented. I'm a little surprised that this hasn't come up before, but I suppose that suspending the parse is relatively uncommon. |
|
@RMJ10 thank you! |
The key is that all branches but the last ended in `return`.
```
BEFORE | AFTER
--------------------+--------------------
if (..a..) { | if (..a..) {
..b..; | ..b..;
return ..c..; | return ..c..;
| }
} else if (..d..) { | if (..d..) {
..e..; | ..e..;
return ..f..; | return ..f..;
} else { | }
..g..; | ..g..;
} |
```
hartwork
force-pushed
the
issue-613-fix-processing-of-nested-entities
branch
from
fb4fb6f
to
6acab0a
Compare
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.
Fixes #613