diff options
author | Paul Phillips <paulp@improving.org> | 2011-01-01 22:46:59 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-01-01 22:46:59 +0000 |
commit | 533ffe9482c530489ad4f6670831b8d87f78193a (patch) | |
tree | 567660ba8ee7f97e283154acdb84e0215195d8ed /src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | |
parent | 03f90c173445e5d988f2e2199026901b4def45b8 (diff) | |
download | scala-533ffe9482c530489ad4f6670831b8d87f78193a.tar.gz scala-533ffe9482c530489ad4f6670831b8d87f78193a.tar.bz2 scala-533ffe9482c530489ad4f6670831b8d87f78193a.zip |
Removed the Name => TypeName implicit conversion.
questions start to arise as the ability to distinguish between type and
term names becomes more fully realized: particularly that the ability
to distinguish between TermSymbols and TypeSymbols has not come along
with the names. In any case, this is more tedious than I might have
anticipated but mostly because it's blazing a trail of typiness to ease
the path for others. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/RefChecks.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 67664b7262..adc7813b9c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -58,7 +58,7 @@ abstract class RefChecks extends InfoTransform { sym setFlag (lateMETHOD | STABLE) if (isNestedModule) { - val moduleVar = sym.owner.info.decl(nme.moduleVarName(sym.name)) + val moduleVar = sym.owner.info.decl(nme.moduleVarName(sym.name.toTermName)) if (moduleVar == NoSymbol) { val tree = gen.mkModuleVarDef(sym) tree.symbol.setInfo(tp) @@ -1004,7 +1004,7 @@ abstract class RefChecks extends InfoTransform { val cdef = mkClassDef(false) if (!sym.allOverriddenSymbols.isEmpty) { - val factory = sym.owner.newMethod(sym.pos, sym.name) + val factory = sym.owner.newMethod(sym.pos, sym.name.toTermName) .setFlag(sym.flags | STABLE).resetFlag(MODULE) .setInfo(PolyType(List(), sym.moduleClass.tpe)) sym.owner.info.decls.enter(factory) @@ -1029,7 +1029,7 @@ abstract class RefChecks extends InfoTransform { if (!transformedInfo) gen.mkModuleVarDef(sym) else { - val vsym0 = sym.owner.info.decl(nme.moduleVarName(sym.name)) + val vsym0 = sym.owner.info.decl(nme.moduleVarName(sym.name.toTermName)) // In case we are dealing with local symbol then we already have correct error with forward reference ValDef(if (vsym0 == NoSymbol) gen.mkModuleVarDef(sym).symbol else vsym0, EmptyTree) } |