From 687dec19304e87536f07fb4e65338121ed1b10c7 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 7 Nov 2015 14:13:06 +0100 Subject: Use more standard way to define LanguageModuleClass --- src/dotty/tools/dotc/core/Definitions.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dotty/tools/dotc/core/Definitions.scala') diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index f3aa78557..384ae47a8 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -393,8 +393,8 @@ class Definitions { def Product_productArity = Product_productArityR.symbol lazy val Product_productPrefixR = ProductTypeRef.symbol.requiredMethod(nme.productPrefix) def Product_productPrefix = Product_productPrefixR.symbol - lazy val LanguageModuleTypeRef = ctx.requiredModule("dotty.language").moduleClass.asClass - def LanguageModuleClass = LanguageModuleTypeRef.symbol.asClass // ### Needed? Maube just keep LanguageModule? + lazy val LanguageModuleRef = ctx.requiredModule("dotty.language") + def LanguageModuleClass = LanguageModuleRef.symbol.moduleClass.asClass lazy val NonLocalReturnControlTypeRef = ctx.requiredClassRef("scala.runtime.NonLocalReturnControl") // Annotation base classes @@ -565,7 +565,7 @@ class Definitions { if (cls.isClass && cls.owner == ScalaPackageClass) cls.asClass.name else EmptyTypeName } - def isVarArityClass(cls: Symbol, prefix: Name) = // ### use scalaClassName + def isVarArityClass(cls: Symbol, prefix: Name) = cls.owner == ScalaPackageClass && cls.name.startsWith(prefix) && cls.name.drop(prefix.length).forall(_.isDigit) -- cgit v1.2.3