[Swift] Fix parse-cancellation in BailErrorStrategy. #2123
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
BailErrorStrategy is supposed to throw an error that's different from the ordinary recognition error, specifically so that it can be handled differently by client code. This was not ported over from Java correctly. Fix this by moving parseCancellation from ANTLRError to ANTLRException, adding its RecognitionException argument, and throwing it from the two handlers in BailErrorStrategy. Also remove ANTLRException.cannotInvokeStartRule, which is unused. (The Java runtime uses it when ParseTreePatternMatcher throws a generic exception, but we don't have that.)
ewanmellor
force-pushed
the
swift-fix-parse-cancellation
branch
from
0b4b25b
to
eb9124f
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.
BailErrorStrategy is supposed to throw an error that's different from
the ordinary recognition error, specifically so that it can be handled
differently by client code. This was not ported over from Java correctly.
Fix this by moving parseCancellation from ANTLRError to ANTLRException,
adding its RecognitionException argument, and throwing it from the
two handlers in BailErrorStrategy.
Also remove ANTLRException.cannotInvokeStartRule, which is unused.
(The Java runtime uses it when ParseTreePatternMatcher throws a generic
exception, but we don't have that.)