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