diff options
| author | Martin Odersky <odersky@gmail.com> | 2010-01-24 15:05:46 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2010-01-24 15:05:46 +0000 |
| commit | 21fbde04b42a63f53d4839221f1fea90f329a72d (patch) | |
| tree | c70c3ffba21e1a7f47fc7d72453959a19e1861c7 /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
| parent | 895c271ead5bfe42a19610871037bfb5c90503e9 (diff) | |
| download | scala-21fbde04b42a63f53d4839221f1fea90f329a72d.tar.gz scala-21fbde04b42a63f53d4839221f1fea90f329a72d.tar.bz2 scala-21fbde04b42a63f53d4839221f1fea90f329a72d.zip | |
renamed notCompiles ==> canRedefine.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 71d325d2c5..c755beb04e 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -197,7 +197,7 @@ trait Namers { self: Analyzer => def enterClassSymbol(tree : ClassDef): Symbol = { var c: Symbol = context.scope.lookup(tree.name) - if (c.isType && c.owner.isPackageClass && context.scope == c.owner.info.decls && currentRun.notCompiles(c)) { + if (c.isType && c.owner.isPackageClass && context.scope == c.owner.info.decls && currentRun.canRedefine(c)) { updatePosFlags(c, tree.pos, tree.mods.flags) setPrivateWithin(tree, c, tree.mods) } else { @@ -214,7 +214,7 @@ trait Namers { self: Analyzer => } clazz.sourceFile = file if (clazz.sourceFile ne null) { - assert(currentRun.notCompiles(clazz) || clazz.sourceFile == currentRun.symSource(c)); + assert(currentRun.canRedefine(clazz) || clazz.sourceFile == currentRun.symSource(c)); currentRun.symSource(c) = clazz.sourceFile } } @@ -229,7 +229,7 @@ trait Namers { self: Analyzer => var m: Symbol = context.scope.lookup(tree.name) val moduleFlags = tree.mods.flags | MODULE | FINAL if (m.isModule && !m.isPackage && inCurrentScope(m) && - (currentRun.notCompiles(m) || (m hasFlag SYNTHETIC))) { + (currentRun.canRedefine(m) || (m hasFlag SYNTHETIC))) { updatePosFlags(m, tree.pos, moduleFlags) setPrivateWithin(tree, m, tree.mods) context.unit.synthetics -= m |