diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-26 00:58:02 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-26 00:58:02 -0700 |
| commit | 5b506690356ffec3e83984f9098b269b1a02159d (patch) | |
| tree | 29fb5b0ea49d987fd0dfece9f6742f3074436865 /src | |
| parent | 643a143504106de439451a4dcb7f76fc8df6b73c (diff) | |
| parent | e7feeaafe6ba83171714ca78b06afabb9320d20d (diff) | |
| download | scala-5b506690356ffec3e83984f9098b269b1a02159d.tar.gz scala-5b506690356ffec3e83984f9098b269b1a02159d.tar.bz2 scala-5b506690356ffec3e83984f9098b269b1a02159d.zip | |
Merge pull request #769 from hubertp/topic/t4842-followup
Minor followup on SI-4842: remove awkward condition. Review by @retronym
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 69d3fd7f47..6bb980260f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1833,7 +1833,7 @@ trait Typers extends Modes with Adaptations with Tags { val params = fn.tpe.params val args2 = if (params.isEmpty || !isRepeatedParamType(params.last.tpe)) args else args.take(params.length - 1) :+ EmptyTree - assert(sameLength(args2, params), "mismatch " + clazz + " " + (params map (_.tpe)) + " " + args2)//debug + assert(sameLength(args2, params) || call.isErrorTyped, "mismatch " + clazz + " " + (params map (_.tpe)) + " " + args2)//debug (superConstr, args1 ::: args2) case Block(stats, expr) if !stats.isEmpty => decompose(stats.last) @@ -2036,7 +2036,7 @@ trait Typers extends Modes with Adaptations with Tags { transformedOrTyped(ddef.rhs, EXPRmode, tpt1.tpe) } - if (meth.isClassConstructor && !isPastTyper && !reporter.hasErrors && !meth.owner.isSubClass(AnyValClass)) { + if (meth.isClassConstructor && !isPastTyper && !meth.owner.isSubClass(AnyValClass)) { // At this point in AnyVal there is no supercall, which will blow up // in computeParamAliases; there's nothing to be computed for Anyval anyway. if (meth.isPrimaryConstructor) |