diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-04-13 12:40:59 -0700 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2012-04-13 12:40:59 -0700 |
| commit | cc764e944817628cbca3f7b5a195cdb495ca8f38 (patch) | |
| tree | 3508dd2fe98420f9f33fc5a4b1985e926dc12561 /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 381c0e12bf5a72df6f3b3ac8eaca1cac28263154 (diff) | |
| download | scala-cc764e944817628cbca3f7b5a195cdb495ca8f38.tar.gz scala-cc764e944817628cbca3f7b5a195cdb495ca8f38.tar.bz2 scala-cc764e944817628cbca3f7b5a195cdb495ca8f38.zip | |
Added languageFeature annotation (was missing before). Resolved problem with late loading of nested classes in Definitions. Resolved handling of deprecated idents `then` and `macro`. Massaged test flags.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index b1cbc53044..1425cd4755 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -743,7 +743,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser { def hasOption = settings.language.value contains featureName if (!hasImport && !hasOption) { val Some(AnnotationInfo(_, List(Literal(Constant(featureDesc: String)), Literal(Constant(required: Boolean))), _)) = - featureTrait getAnnotation LanguageFeatureClass + featureTrait getAnnotation LanguageFeatureAnnot val req = if (required) "needs to" else "should" var raw = featureDesc + " " + req + " be enabled\n" + "by making the implicit value language." + featureName + " visible." |