5 files changed, 30 insertions, 9 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index 428bdb3ab6..883a45b8a2 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -201,7 +201,11 @@ trait Types requires SymbolTable {
     def memberType(sym: Symbol): Type = {
       sym.tpe match {
         case OverloadedType(pre, alts) =>
-          assert(this =:= pre);
+          val pre1 = pre match {
+            case ClassInfoType(_, _, clazz) => clazz.tpe
+            case _ => pre
+          }
+          assert(this =:= pre1);
           sym.tpe
         case _ =>
           //System.out.println("" + this + ".memberType(" + sym +":" + sym.tpe +")");//DEBUG
@@ -2035,7 +2039,7 @@ trait Types requires SymbolTable {
 
   /** Make symbol `sym' a member of scope `tp.decls' where `thistp' is the narrowed
    *  owner type of the scope */
-  private def addMember(thistp: Type, tp: Type, sym: Symbol): unit = {
+  def addMember(thistp: Type, tp: Type, sym: Symbol): unit = {
     if (settings.debug.value) log("add member " + sym);//debug
     if (!(thistp specializes sym)) {
       if (sym.isTerm)
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
index c7f9f775fd..e8f36bf785 100644
--- a/src/compiler/scala/tools/nsc/transform/Mixin.scala
+++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala
@@ -260,7 +260,7 @@ abstract class Mixin extends InfoTransform {
     private def addNewDefs(clazz: Symbol, stats: List[Tree]): List[Tree] = {
       val newDefs = new ListBuffer[Tree];
       def addDef(pos: int, tree: Tree): unit = {
-        if (settings.debug.value) log("add new def to " + clazz + ": " + tree);
+        if (settings.debug.value) System.out.println("add new def to " + clazz + ": " + tree);
         newDefs += localTyper.typed {
 	  atPos(pos) {
 	    tree
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index 6c42012d18..a74c7f20b9 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -22,8 +22,8 @@ trait Namers requires Analyzer {
   class DeSkolemizeMap(tparams: List[Symbol]) extends TypeMap {
     def apply(tp: Type): Type = tp match {
       case TypeRef(pre, sym, args) =>
-      val tparam = sym.deSkolemize;
-      mapOver(
+        val tparam = sym.deSkolemize;
+        mapOver(
           if (tparam == sym || !(tparams contains tparam)) tp
           else rawTypeRef(NoPrefix, tparam, args))
       case SingleType(pre, sym) if (sym.isThisSkolem) =>
@@ -551,6 +551,8 @@ trait Namers requires Analyzer {
 	  "\nit should be omitted for abstract members");
       if (sym.hasFlag(OVERRIDE | ABSOVERRIDE) && sym.isClass)
 	context.error(sym.pos, "`override' modifier not allowed for classes");
+      if (sym.hasFlag(OVERRIDE | ABSOVERRIDE) && sym.isConstructor)
+	context.error(sym.pos, "`override' modifier not allowed for constructors");
       if (sym.hasFlag(ABSOVERRIDE) && !sym.owner.isTrait)
 	context.error(sym.pos, "`abstract override' modifier only allowed for members of traits");
       if (sym.info.symbol == FunctionClass(0) &&
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
index e88545992c..ea640cc661 100644
--- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -175,7 +175,9 @@ abstract class RefChecks extends InfoTransform {
 	} else if (!(other hasFlag DEFERRED) && !(member hasFlag (OVERRIDE | ABSOVERRIDE))) { // (1.3)
 	  overrideError("needs `override' modifier");
 	} else if ((other hasFlag ABSOVERRIDE) && other.isIncompleteIn(clazz) && !(member hasFlag ABSOVERRIDE)) {
-	  overrideError("needs `abstract override' modifiers");
+	  overrideError("needs `abstract override' modifiers")
+        } else if ((member hasFlag (OVERRIDE | ABSOVERRIDE)) && (other hasFlag ACCESSOR) && other.accessed.isVariable) {
+          overrideError("cannot override a mutable variable")
 	} else if (other.isStable) {
           if (!member.isStable) // (1.4)
 	    overrideError("needs to be an immutable value")
@@ -558,7 +560,7 @@ abstract class RefChecks extends InfoTransform {
 
 	case TypeTree() =>
 	  new TypeTraverser {
-	    def traverse(tp: Type) = tp match {
+	    def traverse(tp: Type): TypeTraverser = tp match {
 	      case TypeRef(pre, sym, args) => checkBounds(sym.typeParams, args); this
 	      case _ => this
 	    }
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 8b151063db..5a150c3dcd 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -846,6 +846,19 @@ trait Typers requires Analyzer {
       copy.LabelDef(ldef, ldef.name, ldef.params, rhs1) setType restpe
     }
 
+    def anonymousClassRefinement(clazz: Symbol): Type = {
+      val tp = refinedType(clazz.info.parents, clazz.owner)
+      val thistp = tp.symbol.thisType
+      for (val sym <- clazz.info.decls.toList) {
+        if (!sym.hasFlag(PRIVATE) && !sym.isClass && !sym.isConstructor &&
+            tp.nonPrivateMember(sym.name).filter(other =>
+              !other.isTerm || (thistp.memberType(other) matches thistp.memberType(sym)))
+            != NoSymbol)
+          addMember(thistp, tp, sym)
+      }
+      tp
+    }
+
     def typedBlock(block: Block, mode: int, pt: Type): Block = {
       namer.enterSyms(block.stats)
       block.stats foreach enterLabelDef
@@ -854,9 +867,9 @@ trait Typers requires Analyzer {
       val block1 = copy.Block(block, stats1, expr1)
         .setType(if (treeInfo.isPureExpr(block)) expr1.tpe else expr1.tpe.deconst)
       if (isFullyDefined(pt)) block1
-      else { //todo: correct?
+      else {
         if (block1.tpe.symbol.isAnonymousClass)
-          block1 setType intersectionType(block1.tpe.parents, block1.tpe.symbol.owner)
+          block1 setType anonymousClassRefinement(block1.tpe.symbol)
         checkNoEscaping.locals(context.scope, pt, block1)
       }
     }