From 1c72ffaee5e0faeeb6d046216e5e76c86a6a41ff Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Sun, 29 Mar 2009 17:09:25 +0000
Subject: fix for #1833

---
 src/compiler/scala/tools/nsc/typechecker/Namers.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/compiler')

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)
     }
   }
-- 
cgit v1.2.3