diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2014-01-10 20:28:19 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2014-01-21 12:24:51 +0300 |
| commit | 97286d761a5eaf18cc7018aa162866232a87ed91 (patch) | |
| tree | 1343a6534e5fadd02bfa1b1bf2b67bfa18a7c786 /src/interactive | |
| parent | e089cafb5fd02e2457bafde3252da3a771d3180e (diff) | |
| download | scala-97286d761a5eaf18cc7018aa162866232a87ed91.tar.gz scala-97286d761a5eaf18cc7018aa162866232a87ed91.tar.bz2 scala-97286d761a5eaf18cc7018aa162866232a87ed91.zip | |
moves analyzer.ImportType into scala.reflect.internal
This cute little type is necessary for importers to work correctly.
I wonder how we could overlook its existence for almost 2 years.
Diffstat (limited to 'src/interactive')
| -rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Global.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala index b55a573029..0e897d6492 100644 --- a/src/interactive/scala/tools/nsc/interactive/Global.scala +++ b/src/interactive/scala/tools/nsc/interactive/Global.scala @@ -956,7 +956,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") singleType(qual.tpe, tree.symbol) case Import(expr, selectors) => tree.symbol.info match { - case analyzer.ImportType(expr) => expr match { + case ImportType(expr) => expr match { case s@Select(qual, name) if treeInfo.admitsTypeSelection(expr) => singleType(qual.tpe, s.symbol) case i : Ident => i.tpe case _ => tree.tpe @@ -1021,7 +1021,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") def addScopeMember(sym: Symbol, pre: Type, viaImport: Tree) = locals.add(sym, pre, implicitlyAdded = false) { (s, st) => // imported val and var are always marked as inaccessible, but they could be accessed through their getters. SI-7995 - if (s.hasGetter) + if (s.hasGetter) new ScopeMember(s, st, context.isAccessible(s.getter, pre, superAccess = false), viaImport) else new ScopeMember(s, st, context.isAccessible(s, pre, superAccess = false), viaImport) @@ -1111,7 +1111,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") val pre = stabilizedType(tree) val ownerTpe = tree.tpe match { - case analyzer.ImportType(expr) => expr.tpe + case ImportType(expr) => expr.tpe case null => pre case MethodType(List(), rtpe) => rtpe case _ => tree.tpe |