diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-09 10:41:25 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-09 10:41:25 -0700 |
| commit | 30ef129f322687cbc885d344ca73dd4877fbedd6 (patch) | |
| tree | d1f4291d42b4d558507fc9b7a2d2a9828d73da55 /src | |
| parent | c9602af1d7a601604cc813a6ec73323bccaf0259 (diff) | |
| parent | 666bbe730aa647a8476a33ca79beba671b80b3d2 (diff) | |
| download | scala-30ef129f322687cbc885d344ca73dd4877fbedd6.tar.gz scala-30ef129f322687cbc885d344ca73dd4877fbedd6.tar.bz2 scala-30ef129f322687cbc885d344ca73dd4877fbedd6.zip | |
Merge pull request #694 from retronym/ticket/4831-2
SI-4831 Fix ambiguous import detection for renamed imports.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 2a1af2755f..fec5063bd0 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -4575,17 +4575,17 @@ trait Typers extends Modes with Adaptations with Tags { qual = atPos(tree.pos.focusStart)(gen.mkAttributedQualifier(pre)) } else { if (impSym.exists) { - var impSym1 = NoSymbol + var impSym1: Symbol = NoSymbol var imports1 = imports.tail def ambiguousImport() = { - if (!(imports.head.qual.tpe =:= imports1.head.qual.tpe)) + if (!(imports.head.qual.tpe =:= imports1.head.qual.tpe && impSym == impSym1)) ambiguousError( "it is imported twice in the same scope by\n"+imports.head + "\nand "+imports1.head) } while (errorContainer == null && !imports1.isEmpty && (!imports.head.isExplicitImport(name) || imports1.head.depth == imports.head.depth)) { - var impSym1 = imports1.head.importedSymbol(name) + impSym1 = imports1.head.importedSymbol(name) if (reallyExists(impSym1)) { if (imports1.head.isExplicitImport(name)) { if (imports.head.isExplicitImport(name) || |