File tree 3 files changed +4
-7
lines changed
src/dotty/tools/dotc/core
3 files changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -430,10 +430,8 @@ class Definitions {
430
430
def Product_productArity (implicit ctx : Context ) = Product_productArityR .symbol
431
431
lazy val Product_productPrefixR = ProductClass .requiredMethodRef(nme.productPrefix)
432
432
def Product_productPrefix (implicit ctx : Context ) = Product_productPrefixR .symbol
433
- lazy val LanguageModuleRef = ctx.requiredModule(" dotty .language" )
433
+ lazy val LanguageModuleRef = ctx.requiredModule(" scala .language" )
434
434
def LanguageModuleClass (implicit ctx : Context ) = LanguageModuleRef .symbol.moduleClass.asClass
435
- lazy val Scala2LanguageModuleRef = ctx.requiredModule(" scala.language" )
436
- def Scala2LanguageModuleClass (implicit ctx : Context ) = Scala2LanguageModuleRef .symbol.moduleClass.asClass
437
435
lazy val NonLocalReturnControlType : TypeRef = ctx.requiredClassRef(" scala.runtime.NonLocalReturnControl" )
438
436
439
437
lazy val ClassTagType = ctx.requiredClassRef(" scala.reflect.ClassTag" )
Original file line number Diff line number Diff line change @@ -517,7 +517,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
517
517
*/
518
518
def featureEnabled (owner : ClassSymbol , feature : TermName ): Boolean = {
519
519
def toPrefix (sym : Symbol ): String =
520
- if (! sym.exists || (sym eq defn.LanguageModuleClass ) || (sym eq defn. Scala2LanguageModuleClass ) ) " "
520
+ if (! sym.exists || (sym eq defn.LanguageModuleClass )) " "
521
521
else toPrefix(sym.owner) + sym.name + " ."
522
522
def featureName = toPrefix(owner) + feature
523
523
def hasImport (implicit ctx : Context ): Boolean = {
@@ -536,13 +536,13 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
536
536
537
537
/** Is auto-tupling enabled? */
538
538
def canAutoTuple =
539
- ! featureEnabled(defn.Scala2LanguageModuleClass , nme.noAutoTupling)
539
+ ! featureEnabled(defn.LanguageModuleClass , nme.noAutoTupling)
540
540
541
541
def scala2Mode =
542
542
featureEnabled(defn.LanguageModuleClass , nme.Scala2 )
543
543
544
544
def dynamicsEnabled =
545
- featureEnabled(defn.Scala2LanguageModuleClass , nme.dynamics)
545
+ featureEnabled(defn.LanguageModuleClass , nme.dynamics)
546
546
547
547
def testScala2Mode (msg : String , pos : Position ) = {
548
548
if (scala2Mode) migrationWarning(msg, pos)
Original file line number Diff line number Diff line change 1
- import dotty .language .keepUnions
2
1
object intersection {
3
2
4
3
class A
You can’t perform that action at this time.
0 commit comments