- Changed Parser and RefCheck so that case clas...

- Changed Parser and RefCheck so that case classes AND case objects
inherit from CaseClass

2 files changed, 3 insertions, 5 deletions

diff --git a/sources/scala/tools/scalac/ast/parser/Parser.scala b/sources/scala/tools/scalac/ast/parser/Parser.scala
index 1b811d3aa3..3aa0ac6cb2 100644
--- a/sources/scala/tools/scalac/ast/parser/Parser.scala
+++ b/sources/scala/tools/scalac/ast/parser/Parser.scala
@@ -1886,7 +1886,7 @@ class Parser(unit: CompilationUnit) {
 	  lhs.append(Pair(s.pos, ident()));
     } while (s.token == COMMA);
     val thistpe = simpleTypedOpt();
-    val template = classTemplate( false );
+    val template = classTemplate( (mods & Modifiers.CASE)!= 0 );
     val ts = new myTreeList();
     lhs foreach { case Pair(p, n) =>
       ts.append(
diff --git a/sources/scala/tools/scalac/typechecker/RefCheck.scala b/sources/scala/tools/scalac/typechecker/RefCheck.scala
index f5f1d7c431..4efdf48c51 100755
--- a/sources/scala/tools/scalac/typechecker/RefCheck.scala
+++ b/sources/scala/tools/scalac/typechecker/RefCheck.scala
@@ -862,10 +862,8 @@ class RefCheck(globl: scalac.Global) extends Transformer(globl) {
       }
 
       // the following report error if impl exists
-      if (!clazz.isModuleClass()) {
-        ts.append(caseElementMethod(clazz));
-        ts.append(caseArityMethod(clazz));
-      }
+      ts.append(caseElementMethod(clazz));
+      ts.append(caseArityMethod(clazz));
       ts.append(tagMethod(clazz));
     } else if ((clazz.flags & ABSTRACT) == 0) {
       ts.append(tagMethod(clazz));