summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-10-03 08:05:02 -0700
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-10-03 08:05:02 -0700
commit19eea2b6a0228131b26636c531f1118db6cf79a8 (patch)
tree3da3a2460b1a3a67b854a1f041c1b3b234762e2d /src
parent16553216da54b006ed784003865aa6f28e1a7f9f (diff)
parent0720157cd7d82db6c1efea615c2e78565b4ada0e (diff)
downloadscala-19eea2b6a0228131b26636c531f1118db6cf79a8.tar.gz
scala-19eea2b6a0228131b26636c531f1118db6cf79a8.tar.bz2
scala-19eea2b6a0228131b26636c531f1118db6cf79a8.zip
Merge pull request #1446 from retronym/ticket/6436-2
SI-6436 Handle ambiguous string processors
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index c25b6c3726..335d93f387 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -4578,7 +4578,7 @@ trait Typers extends Modes with Adaptations with Tags {
// xml member to StringContext, which in turn has an unapply[Seq] method)
if (name != nme.CONSTRUCTOR && inExprModeOr(mode, PATTERNmode)) {
val qual1 = adaptToMemberWithArgs(tree, qual, name, mode, true, true)
- if (qual1 ne qual)
+ if ((qual1 ne qual) && !qual1.isErrorTyped)
return typed(treeCopy.Select(tree, qual1, name), mode, pt)
}
NoSymbol