diff options
| author | Paul Phillips <paulp@improving.org> | 2009-03-29 17:09:25 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-03-29 17:09:25 +0000 |
| commit | 1c72ffaee5e0faeeb6d046216e5e76c86a6a41ff (patch) | |
| tree | a253339d3670d2e88933ad4910ab564e568015df /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
| parent | 370f060c6d40838fa467997070d591e16de5f2d3 (diff) | |
| download | scala-1c72ffaee5e0faeeb6d046216e5e76c86a6a41ff.tar.gz scala-1c72ffaee5e0faeeb6d046216e5e76c86a6a41ff.tar.bz2 scala-1c72ffaee5e0faeeb6d046216e5e76c86a6a41ff.zip | |
fix for #1833
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 1389db04e5..ab65225a78 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -996,7 +996,7 @@ trait Namers { self: Analyzer => else "illegal combination of modifiers: " + Flags.flagsToString(flag1) + " and " + Flags.flagsToString(flag2) + - " for: " + sym + Flags.flagsToString(sym.rawflags)); + " for: " + sym); } if (sym.hasFlag(IMPLICIT) && !sym.isTerm) @@ -1034,6 +1034,7 @@ trait Namers { self: Analyzer => checkNoConflict(PRIVATE, PROTECTED) checkNoConflict(PRIVATE, OVERRIDE) /* checkNoConflict(PRIVATE, FINAL) // can't do this because FINAL also means compile-time constant */ + checkNoConflict(ABSTRACT, FINAL) // bug #1833 checkNoConflict(DEFERRED, FINAL) } } |