diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-10 12:22:27 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-10 12:22:27 -0800 |
| commit | 3b2a4ac04b8d3879d1545849680f718599288677 (patch) | |
| tree | 075ad3054f8f4f5cf689e5dd3183d15b19365ecc /src/compiler/scala/tools/nsc/transform/Mixin.scala | |
| parent | c702483d43d6805e4e1591fe307ddceb1768d64a (diff) | |
| parent | 5f2b7c4c36f96f955573c4ac322b8ca6d632abc1 (diff) | |
| download | scala-3b2a4ac04b8d3879d1545849680f718599288677.tar.gz scala-3b2a4ac04b8d3879d1545849680f718599288677.tar.bz2 scala-3b2a4ac04b8d3879d1545849680f718599288677.zip | |
Merge pull request #1729 from JamesIry/SI-5789-2_2.10.x
SI-5789 Removes assertion about implclass flag in Mixin.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Mixin.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index ebbb1d7798..57bdaea17a 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -269,7 +269,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { /** Mix in members of implementation class mixinClass into class clazz */ def mixinImplClassMembers(mixinClass: Symbol, mixinInterface: Symbol) { - assert(mixinClass.isImplClass, "Not an impl class:" + + if (!mixinClass.isImplClass) debugwarn ("Impl class flag is not set " + ((mixinClass.debugLocationString, mixinInterface.debugLocationString))) for (member <- mixinClass.info.decls ; if isForwarded(member)) { @@ -360,7 +360,6 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { // first complete the superclass with mixed in members addMixedinMembers(clazz.superClass, unit) - //Console.println("adding members of " + clazz.info.baseClasses.tail.takeWhile(superclazz !=) + " to " + clazz);//DEBUG for (mc <- clazz.mixinClasses ; if mc hasFlag lateINTERFACE) { // @SEAN: adding trait tracking so we don't have to recompile transitive closures unit.depends += mc |