substitute scala.Matchable for Any

scala · Dec 17, 2020 · 2d7cf45 · 2d7cf45
1 parent a4236c4
commit 2d7cf45
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/src/compiler/scala/tools/nsc/tasty/bridge/NameOps.scala b/src/compiler/scala/tools/nsc/tasty/bridge/NameOps.scala
@@ -52,6 +52,7 @@ trait NameOps { self: TastyUniverse =>
     final val AnyKind: String = "AnyKind"
     final val TupleCons: String = "*:"
     final val Tuple: String = "Tuple"
+    final val Matchable: String = "Matchable"
 
     val ContextFunctionN = raw"ContextFunction(\d+)".r
     val FunctionN        = raw"Function(\d+)".r

diff --git a/src/compiler/scala/tools/nsc/tasty/bridge/TypeOps.scala b/src/compiler/scala/tools/nsc/tasty/bridge/TypeOps.scala
@@ -346,7 +346,7 @@ trait TypeOps { self: TastyUniverse =>
   }
 
   private val SyntheticScala3Type =
-    raw"^(?:&|\||AnyKind|(?:Context)?Function\d+|\*:|Tuple)$$".r
+    raw"^(?:&|\||AnyKind|(?:Context)?Function\d+|\*:|Tuple|Matchable)$$".r
 
   def selectType(name: TastyName.TypeName, prefix: Type)(implicit ctx: Context): Type = selectType(name, prefix, prefix)
   def selectType(name: TastyName.TypeName, prefix: Type, space: Type)(implicit ctx: Context): Type = {
@@ -365,6 +365,7 @@ trait TypeOps { self: TastyUniverse =>
           case tpnme.TupleCons                                        => genTupleIsUnsupported("scala.*:")
           case tpnme.Tuple               if !ctx.mode.is(ReadParents) => genTupleIsUnsupported("scala.Tuple")
           case tpnme.AnyKind                                          => u.definitions.AnyTpe
+          case tpnme.Matchable                                        => u.definitions.AnyTpe
           case _                                                      => lookupType
         }
 

diff --git a/test/tasty/run/src-2/tastytest/TestMatchables.scala b/test/tasty/run/src-2/tastytest/TestMatchables.scala
@@ -0,0 +1,10 @@
+package tastytest
+
+object TestMatchables extends Suite("TestMatchables") {
+
+  test(assert(Matchables.foo == true))
+  test(assert(Matchables.bar("hello") === "hello"))
+  test(assert(new Matchables.baz(23).a === 23))
+  test(assert(new Matchables.qux(5.0).a === 5.0))
+
+}
diff --git a/test/tasty/run/src-3/tastytest/Matchables.scala b/test/tasty/run/src-3/tastytest/Matchables.scala
@@ -0,0 +1,15 @@
+package tastytest
+
+object Matchables {
+
+  def foo: Matchable = true
+
+  def bar[A <: Matchable](a: A) = a match {
+    case a: A => a
+  }
+
+  class baz[A](val a: A) extends Matchable
+
+  class qux[A <: Matchable](val a: A)
+
+}