Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Singleton type subtyping fix #240

Merged
merged 7 commits into from
Nov 19, 2021
Merged

Singleton type subtyping fix #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d2e83f2
begin supporting polymorphic tags
kitlangton Nov 16, 2021
a534244
some changes
kitlangton Nov 16, 2021
5d7f867
add unionTag constructor
kitlangton Nov 16, 2021
2371a1c
comment out failing (passing?) progression tests
kitlangton Nov 16, 2021
40fd50f
fix union <:< support, add/move tests
kitlangton Nov 16, 2021
1915fa5
fix singleton subtyping issue for dotty
kitlangton Nov 19, 2021
97d6fc8
Merge branch 'develop' into singleton-type-subtyping-fix
kitlangton Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,5 @@ project/plugins/project/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*


.vscode
4 changes: 2 additions & 2 deletions izumi-reflect/izumi-reflect/src/main/scala_3/izumi/reflect/dottyreflection/DbInspector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ abstract class DbInspector(protected val shift: Int) extends InspectorBase {
val allbases = tpeBases(i).filter(!_._takesTypeArgs)
val targetRef = {
val tpef = i.dealias.simplified._resultType
inspector.makeNameReferenceFromSymbol(tpef.typeSymbol)
inspector.makeNameReferenceFromType(tpef)
}
allbases.map(b => (targetRef, inspector.makeNameReferenceFromSymbol(b.typeSymbol)))
allbases.map(b => (targetRef, inspector.makeNameReferenceFromType(b)))
}

baseclassReferences
Expand Down
1 change: 1 addition & 0 deletions izumi-reflect/izumi-reflect/src/main/scala_3/izumi/reflect/dottyreflection/Inspect.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ object Inspect {
println(s"${SubtypeDBs(res.basesdb, res.idb)} => ${strDbs.size} bytes, ${string2hex(strDbs)}")
println(strDbs)
}

'{ LightTypeTag.parse(${Expr(hashCodeRef)}, ${Expr(strRef)}, ${Expr(strDbs)}, ${Expr(LightTypeTag.currentBinaryFormatVersion)}) }
}
}
4 changes: 3 additions & 1 deletion izumi-reflect/izumi-reflect/src/main/scala_3/izumi/reflect/dottyreflection/Inspector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,14 +189,16 @@ abstract class Inspector(protected val shift: Int) extends InspectorBase {
orTypeTags ++ otherTypeTags
}

private def makeNameReferenceFromType(t: TypeRepr): NameReference = {
private[dottyreflection] def makeNameReferenceFromType(t: TypeRepr): NameReference = {
t match {
case ref: TypeRef =>
makeNameReferenceFromSymbol(ref.typeSymbol)
case term: TermRef =>
makeNameReferenceFromSymbol(term.termSymbol)
case t: ParamRef =>
NameReference(tpeName = t.binder.asInstanceOf[{ def paramNames: List[Object] }].paramNames(t.paramNum).toString)
case ref =>
makeNameReferenceFromSymbol(ref.typeSymbol)
}
}

Expand Down
8 changes: 7 additions & 1 deletion izumi-reflect/izumi-reflect/src/test/scala/izumi/reflect/test/SharedTagTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ object ID {
type Identity[+A] = A
}

trait Clock
object ClockLive extends Clock

trait ZY extends Assertions {
type T
type U = T
Expand Down Expand Up @@ -55,7 +58,7 @@ final case class testTag2[T: Tag]() {

trait T2[A, B, C[_[_], _], D[_], E]

abstract class SharedTagTest extends AnyWordSpec with XY[String] {
abstract class SharedTagTest extends AnyWordSpec with XY[String] with TagAssertions {

type Swap[A, B] = Either[B, A]
type SwapF2[F[_, _], A, B] = F[B, A]
Expand Down Expand Up @@ -198,6 +201,9 @@ abstract class SharedTagTest extends AnyWordSpec with XY[String] {
assert(TagTK[Id1].tag != TagK[Id].tag)
}

"handle singleton types" in {
assertChild(Tag[ClockLive.type].tag, Tag[Clock].tag)
}
}

}