-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
See through aliases before decomposing And/Or in isSubType
There seem to be two missing cases in TypeComparer where we have a TypeParamRef on one side and an And/Or type under an aloas on the other. Examples: type AND = A & B type OR = A | B p <:< AND OR <:< p In this case we missed the decomposition into smaller types that would happen otherwise. This broke i16311.scala in Ycheck and broke i15365.scala with an infinite recursion in avoidance. I verified that having an AndType as super or subtype of an abstract type works as expected. So if in the example above type AND >: A & B or type AND <: A & B it worked before. It was just aliases that were the problem (I assume it's the same for OrTypes as lower bounds).
- Loading branch information
Showing
6 changed files
with
74 additions
and
16 deletions.
There are no files selected for viewing
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
File renamed without changes.
File renamed without changes.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
object test: | ||
|
||
trait Tagged[U] | ||
type WithTag[+T, U] = T & Tagged[U] | ||
|
||
trait FromInput[Val] | ||
implicit def coercedScalaInput[T]: FromInput[WithTag[T, Int]] = ??? | ||
implicit def optionInput[T](implicit ev: FromInput[T]): FromInput[Option[T]] = ??? | ||
|
||
trait WithoutInputTypeTags[T] | ||
implicit def coercedOptArgTpe[T]: WithoutInputTypeTags[Option[T & Tagged[Int]]] = ??? | ||
|
||
trait InputType[+T] | ||
class OptionInputType[T](ofType: InputType[T]) extends InputType[Option[T]] | ||
|
||
type Argument[T] | ||
def argument[T](argumentType: InputType[T])(implicit fromInput: FromInput[T], res: WithoutInputTypeTags[T]): Argument[Option[T]] = ??? | ||
|
||
def test = argument(OptionInputType(??? : InputType[Boolean & Tagged[Int]])) |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
class C: | ||
trait Tagged[U] | ||
type WithTag[+T, U] >: T & Tagged[U] | ||
|
||
trait FromInput[Val] | ||
implicit def coercedScalaInput[T]: FromInput[WithTag[T, Int]] = ??? | ||
implicit def optionInput[T](implicit ev: FromInput[T]): FromInput[Option[T]] = ??? | ||
|
||
trait WithoutInputTypeTags[T] | ||
implicit def coercedOptArgTpe[T]: WithoutInputTypeTags[Option[WithTag[T, Int]]] = ??? | ||
|
||
trait InputType[+T] | ||
class OptionInputType[T](ofType: InputType[T]) extends InputType[Option[T]] | ||
|
||
type Argument[T] | ||
def argument[T](argumentType: InputType[T])(implicit fromInput: FromInput[T], res: WithoutInputTypeTags[T]): Argument[Option[T]] = ??? | ||
|
||
def test = argument(OptionInputType(??? : InputType[WithTag[Boolean, Int]])) |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
class C: | ||
trait Tagged[U] | ||
type WithTag[+T, U] <: T & Tagged[U] | ||
|
||
trait FromInput[Val] | ||
implicit def coercedScalaInput[T]: FromInput[WithTag[T, Int]] = ??? | ||
implicit def optionInput[T](implicit ev: FromInput[T]): FromInput[Option[T]] = ??? | ||
|
||
trait WithoutInputTypeTags[T] | ||
implicit def coercedOptArgTpe[T]: WithoutInputTypeTags[Option[WithTag[T, Int]]] = ??? | ||
|
||
trait InputType[+T] | ||
class OptionInputType[T](ofType: InputType[T]) extends InputType[Option[T]] | ||
|
||
type Argument[T] | ||
def argument[T](argumentType: InputType[T])(implicit fromInput: FromInput[T], res: WithoutInputTypeTags[T]): Argument[Option[T]] = ??? | ||
|
||
def test = argument(OptionInputType(??? : InputType[WithTag[Boolean, Int]])) |