summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-04-11 16:13:09 -0700
committerMartin Odersky <odersky@gmail.com>2012-04-11 16:13:09 -0700
commit699bb5886ec9e73d7c90be1a280e7420d30e6e9b (patch)
treedf0132cf34731c46730fa058c417d89e5986fe74 /src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
parentb448f13d431a1a4e9d23c6acbf4bd15ccb647e3f (diff)
downloadscala-699bb5886ec9e73d7c90be1a280e7420d30e6e9b.tar.gz
scala-699bb5886ec9e73d7c90be1a280e7420d30e6e9b.tar.bz2
scala-699bb5886ec9e73d7c90be1a280e7420d30e6e9b.zip
new annotation targets for companion classes/objects/factory methods.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
index ff0bdf7580..4a05b28867 100644
--- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -832,7 +832,7 @@ trait ContextErrors {
implicit val context0 = context
object SymValidateErrors extends Enumeration {
- val ImplicitConstr, ImplicitNotTerm, ImplicitTopObject,
+ val ImplicitConstr, ImplicitNotTermOrClass, ImplicitAtToplevel,
OverrideClass, SealedNonClass, AbstractNonClass,
OverrideConstr, AbstractOverride, LazyAndEarlyInit,
ByNameParameter, AbstractVar = Value
@@ -898,10 +898,10 @@ trait ContextErrors {
case ImplicitConstr =>
"`implicit' modifier not allowed for constructors"
- case ImplicitNotTerm =>
- "`implicit' modifier can be used only for values, variables and methods"
+ case ImplicitNotTermOrClass =>
+ "`implicit' modifier can be used only for values, variables, methods and classes"
- case ImplicitTopObject =>
+ case ImplicitAtToplevel =>
"`implicit' modifier cannot be used for top-level objects"
case OverrideClass =>