diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-17 18:10:07 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-17 18:10:07 +0000 |
| commit | aa9e1fe86f2c64b4386d36aa1958a051932475f4 (patch) | |
| tree | 03403889ee46fa2d2d8772b3c59459b182651be3 | |
| parent | ec93f67c5c9d5b2c8ab5b08255686ddca171eb1d (diff) | |
| download | scala-aa9e1fe86f2c64b4386d36aa1958a051932475f4.tar.gz scala-aa9e1fe86f2c64b4386d36aa1958a051932475f4.tar.bz2 scala-aa9e1fe86f2c64b4386d36aa1958a051932475f4.zip | |
Merged revisions 23009,23021 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r23009 | eugenevigdorchik | 2010-09-16 21:30:30 +0200 (Thu, 16 Sep 2010) | 1 line
include all symbols from enclosing scopes as well as member
of enclosing class chain. review by odersky ........ r23021 |
eugenevigdorchik | 2010-09-17 10:56:55 +0200 (Fri, 17 Sep 2010) | 1 line
Correctly get all scope symbols and members. review by odersky
........
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 1f90d6c061..59221eb348 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -438,12 +438,14 @@ self => while (cx != NoContext) { for (sym <- cx.scope) addScopeMember(sym, NoPrefix, EmptyTree) - cx = cx.enclClass - val pre = cx.prefix - for (sym <- pre.members) - addScopeMember(sym, pre, EmptyTree) + if (cx == cx.enclClass) { + val pre = cx.prefix + for (sym <- pre.members) + addScopeMember(sym, pre, EmptyTree) + } cx = cx.outer } + for (imp <- context.imports) { val pre = imp.qual.tpe for (sym <- imp.allImportedSymbols) { |