Improve type nullability for IntervalSet #174
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
ftomassetti
approved these changes
Feb 16, 2024
| @@ -143,7 +143,7 @@ public class IntervalSet : IntSet { | |||
| } | |||
| } | |||
|
|
|||
| private var _intervals: MutableList<Interval> = ArrayList(8) | |||
| private var _intervals: MutableList<Interval> = ArrayList(16) | |||
There was a problem hiding this comment.
Should we use a constant or provide an explanation for the "magic constant"?
antlr-kotlin-runtime/src/commonMain/kotlin/org/antlr/v4/kotlinruntime/misc/IntervalSet.kt
Outdated
Show resolved
Hide resolved
| @Suppress("LocalVariableName") | ||
| val I = iter.next() | ||
| while (i < n) { | ||
| val I = _intervals[i++] |
There was a problem hiding this comment.
having i and capital I is a bit confusing. I would call this one currInterval and i -> index
There was a problem hiding this comment.
Yeah I know, names are not the best! But I'd like to keep it as it is to match ANTLR 4.
| @Suppress("LocalVariableName") | ||
| val I = iter.next() | ||
| while (i < n) { | ||
| val I = _intervals[i++] |
lppedd
force-pushed
the
perf/interval-set
branch
from
9d4fc2a
to
a413287
Compare
|
Thank you @lppedd ! |
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.
IntervalSetseems to be a hot path, so the less nullability checks we have, and the less iterators we use, the better.Also tested with the ANTLR 5 test suite.