diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-06-10 11:51:42 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-06-10 11:51:42 +0200 |
| commit | e1126fdc496a880014825648844f22895b37cb7c (patch) | |
| tree | bbebb66b80dd2286135c9f398bd7844d57d34cc3 /src | |
| parent | 0ba6d1c6d93079750cbccbdfeb5340287b7fb8c6 (diff) | |
| parent | a6ecfa633a76162575ceb332b40ceed93eef490a (diff) | |
| download | scala-e1126fdc496a880014825648844f22895b37cb7c.tar.gz scala-e1126fdc496a880014825648844f22895b37cb7c.tar.bz2 scala-e1126fdc496a880014825648844f22895b37cb7c.zip | |
Merge pull request #3812 from retronym/merge/2.10.x-to-2.11.x-20140604
Merge 2.10.x to 2.11.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala index dceb0a47d8..284ab2f6f9 100644 --- a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala +++ b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala @@ -174,8 +174,8 @@ trait NamesDefaults { self: Analyzer => // assigning the correct method symbol, typedSelect will just assign the type. the reason // to still call 'typed' is to correctly infer singleton types, SI-5259. val selectPos = - if(qual.pos.isRange && baseFun.pos.isRange) qual.pos.union(baseFun.pos).withStart(Math.min(qual.pos.end, baseFun.pos.end)) - else baseFun.pos + if(qual.pos.isRange && baseFun1.pos.isRange) qual.pos.union(baseFun1.pos).withStart(Math.min(qual.pos.end, baseFun1.pos.end)) + else baseFun1.pos val f = blockTyper.typedOperator(Select(newQual, selected).setSymbol(baseFun1.symbol).setPos(selectPos)) if (funTargs.isEmpty) f else TypeApply(f, funTargs).setType(baseFun.tpe) |