From 57a569ba3cf5a528a6f88bdbef1fc76ca2771941 Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Tue, 29 May 2007 17:43:16 +0000
Subject: fixed bug1092

---
 .../scala/tools/nsc/ast/TreePrinters.scala         |  2 +-
 .../scala/tools/nsc/typechecker/Typers.scala       | 50 ++++++++++------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
index 4ffb2ef07a..3d8e546729 100644
--- a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
@@ -256,7 +256,7 @@ abstract class TreePrinters {
           print("new "); print(tpe)
 
         case Typed(expr, tp) =>
-          print("("); print(expr); print(") : "); print(tp)
+          print("("); print(expr); print(": "); print(tp); print(")")
 
         case TypeApply(fun, targs) =>
           print(fun); printRow(targs, "[", ", ", "]")
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 3e87dbcc7d..93de2f5cb1 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1106,37 +1106,33 @@ trait Typers requires Analyzer {
         val superClazz = superConstr.symbol.owner
         if (!superClazz.hasFlag(JAVA)) {
           val superParamAccessors = superClazz.constrParamAccessors
-          if (superParamAccessors.length != superArgs.length) {
-            Console.println("" + superClazz + ":" +
-              superClazz.info.decls.toList.filter(.hasFlag(PARAMACCESSOR)))
-            assert(false, "mismatch: " + superParamAccessors +
-                          ";" + rhs + ";" + superClazz.info.decls)//debug
-          }
-          List.map2(superParamAccessors, superArgs) { (superAcc, superArg) =>
-            superArg match {
-              case Ident(name) =>
-                if (vparamss.exists(.exists(vp => vp.symbol == superArg.symbol))) {
-                  var alias = superAcc.initialize.alias
-                  if (alias == NoSymbol)
-                    alias = superAcc.getter(superAcc.owner)
-                  if (alias != NoSymbol &&
-                      superClazz.info.nonPrivateMember(alias.name) != alias)
-                    alias = NoSymbol
-                  if (alias != NoSymbol) {
-                    var ownAcc = clazz.info.decl(name).suchThat(.hasFlag(PARAMACCESSOR))
-                    if ((ownAcc hasFlag ACCESSOR) && !(ownAcc hasFlag DEFERRED))
-                      ownAcc = ownAcc.accessed
-                    if (!ownAcc.isVariable && !alias.accessed.isVariable) {
-                      if (settings.debug.value)
-                        log("" + ownAcc + " has alias "+alias + alias.locationString);//debug
-                      ownAcc.asInstanceOf[TermSymbol].setAlias(alias)
+          if (superParamAccessors.length == superArgs.length) {
+            List.map2(superParamAccessors, superArgs) { (superAcc, superArg) =>
+              superArg match {
+                case Ident(name) =>
+                  if (vparamss.exists(.exists(vp => vp.symbol == superArg.symbol))) {
+                    var alias = superAcc.initialize.alias
+                    if (alias == NoSymbol)
+                      alias = superAcc.getter(superAcc.owner)
+                    if (alias != NoSymbol &&
+                        superClazz.info.nonPrivateMember(alias.name) != alias)
+                      alias = NoSymbol
+                    if (alias != NoSymbol) {
+                      var ownAcc = clazz.info.decl(name).suchThat(.hasFlag(PARAMACCESSOR))
+                      if ((ownAcc hasFlag ACCESSOR) && !(ownAcc hasFlag DEFERRED))
+                        ownAcc = ownAcc.accessed
+                      if (!ownAcc.isVariable && !alias.accessed.isVariable) {
+                        if (settings.debug.value)
+                          log("" + ownAcc + " has alias "+alias + alias.locationString);//debug
+                        ownAcc.asInstanceOf[TermSymbol].setAlias(alias)
+                      }
                     }
                   }
-                }
-              case _ =>
+                case _ =>
+              }
+              ()
             }
           }
-          ()
         }
       }
     }
-- 
cgit v1.2.3