arrays.equals and nullabe TerminalNodes #8
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
added Arrays.equals for IntArray and nullable Arrays
|
There is a compilation error: |
ftomassetti
reviewed
Apr 17, 2018
| return equals(a!!, b!!) | ||
| } | ||
|
|
||
| expect class BitSet() { |
There was a problem hiding this comment.
why did you remove the constructor from BitSet?
There was a problem hiding this comment.
I only moved the constructor so it is right after the classname 'BitSet()'. There is no difference semantically.
| val a = o as ArrayPredictionContext? | ||
| TODO() | ||
| //return Arrays.equals(returnStates, a!!.returnStates) && Arrays.equals(parents, a.parents) | ||
| o as ArrayPredictionContext |
There was a problem hiding this comment.
why casting it if we do not save it?
There was a problem hiding this comment.
So the compiler can infer the type later. IntelliJ uses the same trick when generating equals(). Maybe it's a hack, I'm not sure.
| @@ -705,11 +705,11 @@ RuleContextDecl(r) ::= "var <r.name>: <r.ctxName>? = null" | |||
| RuleContextListDecl(rdecl) ::= "var <rdecl.name> : MutableList\<<rdecl.ctxName>> = ArrayList\<<rdecl.ctxName>>()" | |||
|
|
|||
| ContextTokenGetterDecl(t) ::= | |||
| "fun <t.name>() : TerminalNode = getToken(<parser.name>.Tokens.<t.name>.id, 0) as TerminalNode" | |||
| "fun <t.name>() : TerminalNode? = getToken(<parser.name>.Tokens.<t.name>.id, 0)" | |||
There was a problem hiding this comment.
Probably making these types nullable is causing the compilation issue we see on Travis
There was a problem hiding this comment.
Yes. I probably need to update some of the dependent code as well.
fix imports of generated sources
ftomassetti
reviewed
Apr 30, 2018
| sourceSets { | ||
| generated { | ||
| kotlin.srcDir 'generated-src/antlr/' | ||
| } | ||
| } | ||
| compileKotlin.source sourceSets.generated.kotlin, sourceSets.main.kotlin | ||
|
|
||
| clean{ |
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.
implemented Arrays.equals for nullable and primitive integer types.
TerminalNodes from ContextTokenGetter are nullable