Fix #7965: Deal with AndTypes in joins #7992
Merged
Conversation
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
Allow that the base type of a join may be a conjunction.
smarter
requested changes
Jan 15, 2020
| @@ -212,6 +212,8 @@ trait TypeOps { this: Context => // TODO: Make standalone object. | |||
| tp1.derivedAppliedType( | |||
| mergeRefinedOrApplied(tycon1, tycon2), | |||
| ctx.typeComparer.lubArgs(args1, args2, tycon1.typeParams)) | |||
| case AndType(tp21, tp22) => | |||
There was a problem hiding this comment.
This handles having tp1 be an AppliedType and tp2 be an AndType, but it seems that we'd need similar special cases when tp1 is a RefinedType and tp2 is an AndType, etc. Instead maybe all calls to fail in this method could be replaced by a fallback that handles the recursion when tp2 is an AndType.
smarter
requested changes
Jan 15, 2020
| } | ||
| case tp1 @ AppliedType(tycon1, args1) => | ||
| tp2 match { | ||
| case AppliedType(tycon2, args2) => | ||
| tp1.derivedAppliedType( | ||
| mergeRefinedOrApplied(tycon1, tycon2), | ||
| ctx.typeComparer.lubArgs(args1, args2, tycon1.typeParams)) | ||
| case _ => fail | ||
| case _ => fallback | ||
| } | ||
| case tp1 @ TypeRef(pre1, _) => | ||
| tp2 match { | ||
| case tp2 @ TypeRef(pre2, _) if tp1.name eq tp2.name => | ||
| tp1.derivedSelect(pre1 | pre2) | ||
| case _ => fail |
There was a problem hiding this comment.
The fallback is also necessary here, otherwise the following would crash:
class Outer {
class Elem
}
class Test {
val o1: Outer = ???
val o2: Outer = ???
val o3: Outer = ???
val x: o1.Elem | (o2.Elem & o3.Elem)
def foo[T <: Outer#Elem](has: T): T = ???
foo(x)
}
6 tasks
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.
Allow that the base type of a join may be a conjunction.