diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-04-09 10:50:35 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-04-09 10:50:35 +1000 |
| commit | 213f0f8a90872bcd07598e0e89666586d774f211 (patch) | |
| tree | 0b1d1f78c73e2f4e253ec25031144544ccd87c94 | |
| parent | 338f3853f00acab67f74b17d33d0b7bf2b089900 (diff) | |
| parent | 1ae8f3050b989ff9b16defb9e87225a1f692256a (diff) | |
| download | scala-213f0f8a90872bcd07598e0e89666586d774f211.tar.gz scala-213f0f8a90872bcd07598e0e89666586d774f211.tar.bz2 scala-213f0f8a90872bcd07598e0e89666586d774f211.zip | |
Merge pull request #4439 from esfand-r/error-message-improvement
Error message improvement
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala | 2 | ||||
| -rw-r--r-- | test/files/neg/t0899.check | 6 | ||||
| -rw-r--r-- | test/files/neg/t562.check | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala index db81eecdf5..e0d96df062 100644 --- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala @@ -322,7 +322,7 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT case Super(_, mix) => if (sym.isValue && !sym.isMethod || sym.hasAccessorFlag) { if (!settings.overrideVars) - reporter.error(tree.pos, "super may be not be used on " + sym.accessedOrSelf) + reporter.error(tree.pos, "super may not be used on " + sym.accessedOrSelf) } else if (isDisallowed(sym)) { reporter.error(tree.pos, "super not allowed here: use this." + name.decode + " instead") } diff --git a/test/files/neg/t0899.check b/test/files/neg/t0899.check index 8b71be8e0c..28cb06ae5a 100644 --- a/test/files/neg/t0899.check +++ b/test/files/neg/t0899.check @@ -1,10 +1,10 @@ -t0899.scala:9: error: super may be not be used on value o +t0899.scala:9: error: super may not be used on value o override val o = "Ha! " + super.o ^ -t0899.scala:11: error: super may be not be used on variable v +t0899.scala:11: error: super may not be used on variable v super.v = "aa" ^ -t0899.scala:12: error: super may be not be used on variable v +t0899.scala:12: error: super may not be used on variable v println(super.v) ^ three errors found diff --git a/test/files/neg/t562.check b/test/files/neg/t562.check index 8c3823642a..95be075af1 100644 --- a/test/files/neg/t562.check +++ b/test/files/neg/t562.check @@ -1,4 +1,4 @@ -t562.scala:10: error: super may be not be used on value y +t562.scala:10: error: super may not be used on value y override val y = super.y; ^ one error found |