[Swift] Make ATNDeserializationOptions a simple struct. #2155
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
Remove HashMap, and replace all uses of it with dictionaries. There's no need for us to have a custom HashMap implementation (mirroring the Java standard library) when Swift's standard dictionaries work just fine. Fix Parser.bypassAltsAtnCache. This was declared as a Parser instance variable, when in the Java runtime it is static (and therefore the cache outlives the Parser instances). It was also being handled in a thread-unsafe manner, because the cache was being read outside of the mutex that was supposed to be protecting it. Fix both issues by moving the cache and the mutex so that they are static to the Parser module and rewriting getATNWithBypassAlts. Remove Parser.decisionToDFAMutex. The Java code uses a synchronized block on ParserATNSimulator.decisionToDFA, but the translation to Swift had put a mutex in Parser. The decisionToDFA value is shared between Parser, ParserATNSimulator, and the generated parser, so a mutex in ParserATNSimulator isn't blocking all possible accesses, so it's useless. Since this is only code for debugging anyway, just remove the useless mutex and simplify getDFAStrings and dumpDFA.
The previous code was ported from Java, which resulted in 70 lines of code to hold two bools. Use a struct instead.
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.
The previous code was ported from Java, which resulted in 70 lines of code to hold two bools. Use a struct instead.
This depends on PR #2154 because of merge conflicts.