Repository navigation
Conversation
The try/catch depth was not reset when entering a loop, so a break or continue that only exits a loop sitting entirely inside a try body was rejected as "not allowed inside try/catch". Reset the depth per loop and restore it afterwards; break/continue inside a try that is itself inside the loop is still rejected.
This file contains hidden or 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
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.
Tolk 1.5 (#2577) rejects
break/continuewhen the whole loop sits inside atryblock, even though the jump only leaves that inner loop and never crosses thetryboundary:The same thing happens for
continue, forrepeat/do-while, and for a loop insidecatch.The cause is in
LoopBreakContinueValidator:inside_try_catchis never reset when a new loop starts, so atryoutside the loop counts the same as atryinside it. The fix saves the counter, resets it to 0 for the loop body, and restores it afterwards. Abreakin atrythat is inside the loop is still rejected, as before.Tests:
break-continue-tests.tolk: 5 runtime cases (179–183). They coverbreakandcontinuein a loop insidetry,breakin a loop insidecatch, athrowafter a breakable loop insidetry(the catch still sees the right values), and atrywith a breakable loop nested in an outer breakable loop.err-break-continue.tolk:try { while { try { break } } }is still a compile error.I ran the full
tolk-testersuite locally with and without the change. The only difference isbreak-continue-tests.tolk: it fails without the fix because of the new cases, and passes with it (107 cases).