@@ -279,12 +279,12 @@ class Definitions {
279
279
* To achieve this, we synthesize all Any and Object methods; Object methods no longer get
280
280
* loaded from a classfile.
281
281
*/
282
- @ tu lazy val AnyClass : ClassSymbol = completeClass(enterCompleteClassSymbol(ScalaPackageClass , tpnme.Any , Abstract , Nil ), ensureCtor = false )
282
+ @ tu lazy val AnyClass : ClassSymbol = completeClass(enterCompleteClassSymbol(ScalaPackageClass , tpnme.Any , Abstract | TransparentType , Nil ), ensureCtor = false )
283
283
def AnyType : TypeRef = AnyClass .typeRef
284
- @ tu lazy val MatchableClass : ClassSymbol = completeClass(enterCompleteClassSymbol(ScalaPackageClass , tpnme.Matchable , Trait , AnyType :: Nil ), ensureCtor = false )
284
+ @ tu lazy val MatchableClass : ClassSymbol = completeClass(enterCompleteClassSymbol(ScalaPackageClass , tpnme.Matchable , Trait | TransparentType , AnyType :: Nil ), ensureCtor = false )
285
285
def MatchableType : TypeRef = MatchableClass .typeRef
286
286
@ tu lazy val AnyValClass : ClassSymbol =
287
- val res = completeClass(enterCompleteClassSymbol(ScalaPackageClass , tpnme.AnyVal , Abstract , List (AnyType , MatchableType )))
287
+ val res = completeClass(enterCompleteClassSymbol(ScalaPackageClass , tpnme.AnyVal , Abstract | TransparentType , List (AnyType , MatchableType )))
288
288
// Mark companion as absent, so that class does not get re-completed
289
289
val companion = ScalaPackageVal .info.decl(nme.AnyVal ).symbol
290
290
companion.moduleClass.markAbsent()
@@ -2062,42 +2062,12 @@ class Definitions {
2062
2062
HasProblematicGetClass .contains(className)
2063
2063
2064
2064
@ tu lazy val assumedTransparentNames : Map [Name , Set [Symbol ]] =
2065
- // add these for now, until we had a chance to retrofit 2.13 stdlib
2066
2065
// we should do a more through sweep through it then.
2067
2066
val strs = Map (
2068
- " Any" -> Set (" scala" ),
2069
- " AnyVal" -> Set (" scala" ),
2070
- " Matchable" -> Set (" scala" ),
2071
- " Product" -> Set (" scala" ),
2072
2067
" Object" -> Set (" java.lang" ),
2073
2068
" Comparable" -> Set (" java.lang" ),
2074
2069
" Serializable" -> Set (" java.io" ),
2075
- " BitSetOps" -> Set (" scala.collection" ),
2076
- " IndexedSeqOps" -> Set (" scala.collection" , " scala.collection.mutable" , " scala.collection.immutable" ),
2077
- " IterableOnceOps" -> Set (" scala.collection" ),
2078
- " IterableOps" -> Set (" scala.collection" ),
2079
- " LinearSeqOps" -> Set (" scala.collection" , " scala.collection.immutable" ),
2080
- " MapOps" -> Set (" scala.collection" , " scala.collection.mutable" , " scala.collection.immutable" ),
2081
- " SeqOps" -> Set (" scala.collection" , " scala.collection.mutable" , " scala.collection.immutable" ),
2082
- " SetOps" -> Set (" scala.collection" , " scala.collection.mutable" , " scala.collection.immutable" ),
2083
- " SortedMapOps" -> Set (" scala.collection" , " scala.collection.mutable" , " scala.collection.immutable" ),
2084
- " SortedOps" -> Set (" scala.collection" ),
2085
- " SortedSetOps" -> Set (" scala.collection" , " scala.collection.mutable" , " scala.collection.immutable" ),
2086
- " StrictOptimizedIterableOps" -> Set (" scala.collection" ),
2087
- " StrictOptimizedLinearSeqOps" -> Set (" scala.collection" ),
2088
- " StrictOptimizedMapOps" -> Set (" scala.collection" , " scala.collection.immutable" ),
2089
- " StrictOptimizedSeqOps" -> Set (" scala.collection" , " scala.collection.immutable" ),
2090
- " StrictOptimizedSetOps" -> Set (" scala.collection" , " scala.collection.immutable" ),
2091
- " StrictOptimizedSortedMapOps" -> Set (" scala.collection" , " scala.collection.immutable" ),
2092
- " StrictOptimizedSortedSetOps" -> Set (" scala.collection" , " scala.collection.immutable" ),
2093
- " ArrayDequeOps" -> Set (" scala.collection.mutable" ),
2094
- " DefaultSerializable" -> Set (" scala.collection.generic" ),
2095
- " IsIterable" -> Set (" scala.collection.generic" ),
2096
- " IsIterableLowPriority" -> Set (" scala.collection.generic" ),
2097
- " IsIterableOnce" -> Set (" scala.collection.generic" ),
2098
- " IsIterableOnceLowPriority" -> Set (" scala.collection.generic" ),
2099
- " IsMap" -> Set (" scala.collection.generic" ),
2100
- " IsSeq" -> Set (" scala.collection.generic" ))
2070
+ )
2101
2071
strs.map { case (simple, pkgs) => (
2102
2072
simple.toTypeName,
2103
2073
pkgs.map(pkg => staticRef(pkg.toTermName, isPackage = true ).symbol.moduleClass)
0 commit comments