diff options
Diffstat (limited to 'src')
3 files changed, 21 insertions, 16 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala b/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala index edc87108b4..f2e62856d5 100644 --- a/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala +++ b/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala @@ -56,7 +56,6 @@ trait AnnotationInfos extends reflect.generic.AnnotationInfos { self: SymbolTabl else definitions.ScalaSignatureAnnotation.tpe } - object ScalaSigBytes extends ScalaSigBytesExtractor /** Represents a nested classfile annotation */ case class NestedAnnotArg(annInfo: AnnotationInfo) diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index ea4109bd3a..72f6f1ae39 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -393,12 +393,22 @@ abstract class RefChecks extends InfoTransform { // 2. Check that only abstract classes have deferred members if (clazz.isClass && !clazz.isTrait) { + def isClazzAbstract = clazz hasFlag ABSTRACT + val abstractErrors = new ListBuffer[String] + def abstractErrorMessage = + // a little formatting polish + if (abstractErrors.size <= 2) abstractErrors mkString " " + else abstractErrors.tail.mkString(abstractErrors.head + ":\n", "\n", "") + def abstractClassError(mustBeMixin: Boolean, msg: String) { - unit.error(clazz.pos, - (if (clazz.isAnonymousClass || clazz.isModuleClass) "object creation impossible" - else if (mustBeMixin) clazz.toString() + " needs to be a mixin" - else clazz.toString() + " needs to be abstract") + ", since " + msg); - clazz.setFlag(ABSTRACT) + def prelude = ( + if (clazz.isAnonymousClass || clazz.isModuleClass) "object creation impossible" + else if (mustBeMixin) clazz + " needs to be a mixin" + else clazz + " needs to be abstract" + ) + ", since" + + if (abstractErrors.isEmpty) abstractErrors ++= List(prelude, msg) + else abstractErrors += msg } def javaErasedOverridingSym(sym: Symbol): Symbol = @@ -415,7 +425,7 @@ abstract class RefChecks extends InfoTransform { ((member hasFlag JAVA) && javaErasedOverridingSym(member) != NoSymbol) for (member <- clazz.tpe.nonPrivateMembersAdmitting(VBRIDGE)) - if (member.isDeferred && !(clazz hasFlag ABSTRACT) && !ignoreDeferred(member)) { + if (member.isDeferred && !isClazzAbstract && !ignoreDeferred(member)) { abstractClassError( false, infoString(member) + " is not defined" + analyzer.varNotice(member)) } else if ((member hasFlag ABSOVERRIDE) && member.isIncompleteIn(clazz)) { @@ -449,7 +459,11 @@ abstract class RefChecks extends InfoTransform { if (!parents.isEmpty && parents.head.typeSymbol.hasFlag(ABSTRACT)) checkNoAbstractDecls(parents.head.typeSymbol) } - if (!(clazz hasFlag ABSTRACT)) checkNoAbstractDecls(clazz) + if (abstractErrors.isEmpty && !isClazzAbstract) + checkNoAbstractDecls(clazz) + + if (abstractErrors.nonEmpty) + unit.error(clazz.pos, abstractErrorMessage) } /** Returns whether there is a symbol declared in class `inclazz` diff --git a/src/library/scala/reflect/generic/AnnotationInfos.scala b/src/library/scala/reflect/generic/AnnotationInfos.scala index cc6c909a45..6239ca189c 100755 --- a/src/library/scala/reflect/generic/AnnotationInfos.scala +++ b/src/library/scala/reflect/generic/AnnotationInfos.scala @@ -20,9 +20,6 @@ trait AnnotationInfos { self: Universe => type ArrayAnnotArg <: ClassfileAnnotArg val ArrayAnnotArg: ArrayAnnotArgExtractor - type ScalaSigBytes <: ClassfileAnnotArg - val ScalaSigBytes: ScalaSigBytesExtractor - type NestedAnnotArg <: ClassfileAnnotArg val NestedAnnotArg: NestedAnnotArgExtractor @@ -36,11 +33,6 @@ trait AnnotationInfos { self: Universe => def unapply(arg: ArrayAnnotArg): Option[Array[ClassfileAnnotArg]] } - abstract class ScalaSigBytesExtractor { - def apply(bytes: Array[Byte]): ScalaSigBytes - def unapply(arg: ScalaSigBytes): Option[Array[Byte]] - } - abstract class NestedAnnotArgExtractor { def apply(anninfo: AnnotationInfo): NestedAnnotArg def unapply(arg: NestedAnnotArg): Option[AnnotationInfo] |