diff options
author | Paul Phillips <paulp@improving.org> | 2013-10-12 13:22:29 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-10-12 13:23:52 -0700 |
commit | 1edddfa7fd3066b2c336eb16f105283f5e9c18cd (patch) | |
tree | 88d364a3fc4bcf670dba66a94df87d78eb07fbff /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
parent | 351a3e0da6bf84bcdfdd1b0fb02f16c0d9896cb1 (diff) | |
download | scala-1edddfa7fd3066b2c336eb16f105283f5e9c18cd.tar.gz scala-1edddfa7fd3066b2c336eb16f105283f5e9c18cd.tar.bz2 scala-1edddfa7fd3066b2c336eb16f105283f5e9c18cd.zip |
Eliminate redundant pickling code.
This commit drops about 700 lines of redundant traversal logic.
There had been ad hoc adjustments to the pickling scheme here and
there, probably in pursuit of tiny performance improvements.
For instance, a Block was pickled expr/stats instead of stats/expr,
a TypeDef was pickled rhs/tparams instead of tparams/rhs.
The benefits derived are invisible compared to the cost of having
several hundred lines of tree traversal code duplicated in half a
dozen or more places.
After making Traverser consistent/complete, it was a straightforward
matter to use it for pickling. It is ALSO now possible to write a
vastly cleaner tree printer than the ones presently in trunk, but I
leave this as an exercise for Dear Reviewer.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 599969598e..e3d7bfd4f8 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -425,11 +425,10 @@ trait Namers extends MethodSynthesis { sym } - /** Enter a module symbol. The tree parameter can be either - * a module definition or a class definition. + /** Enter a module symbol. */ def enterModuleSymbol(tree : ModuleDef): Symbol = { - var m: Symbol = context.scope lookupAll tree.name find (_.isModule) getOrElse NoSymbol + var m: Symbol = context.scope lookupModule tree.name val moduleFlags = tree.mods.flags | MODULE if (m.isModule && !m.isPackage && inCurrentScope(m) && (currentRun.canRedefine(m) || m.isSynthetic)) { updatePosFlags(m, tree.pos, moduleFlags) |