diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2016-10-12 16:06:40 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan@lightbend.com> | 2016-10-12 16:08:18 -0700 |
commit | b2b459115a7a0e1767bece648c1fdaf84533dce2 (patch) | |
tree | 0363dfc16fce3b107949790ce843666af56f3f95 /src/compiler/scala/tools/nsc/transform/Fields.scala | |
parent | 1e81a09a896a0d7497687b5df1b8220172eaec92 (diff) | |
download | scala-b2b459115a7a0e1767bece648c1fdaf84533dce2.tar.gz scala-b2b459115a7a0e1767bece648c1fdaf84533dce2.tar.bz2 scala-b2b459115a7a0e1767bece648c1fdaf84533dce2.zip |
Detect clash of mixedin val and existing member.
Before, we looked only at the result type, which was silly.
This was originally motivated by a hack to get to the error
about conflicting paramaccessors. The error detection for that
can now be formulated more directly.
Fixes scala/scala-dev#244
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Fields.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/Fields.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Fields.scala b/src/compiler/scala/tools/nsc/transform/Fields.scala index f66e00ce1a..0fe7a82b15 100644 --- a/src/compiler/scala/tools/nsc/transform/Fields.scala +++ b/src/compiler/scala/tools/nsc/transform/Fields.scala @@ -359,12 +359,12 @@ abstract class Fields extends InfoTransform with ast.TreeDSL with TypingTransfor val site = clazz.thisType // setter conflicts cannot arise independently from a getter conflict, since a setter without a getter does not a val definition make - def accessorConflictsExistingVal(accessor: Symbol): Boolean = { - val existingGetter = oldDecls.lookup(accessor.name.getterName) -// println(s"$existingGetter from $accessor to ${accessor.name.getterName}") - val tp = fieldTypeOfAccessorIn(accessor, site) - (existingGetter ne NoSymbol) && (tp matches (site memberInfo existingGetter).resultType) // !existingGetter.isDeferred && -- see (3) - } + def getterConflictsExistingVal(getter: Symbol): Boolean = + getter.isGetter && { + val existingGetter = oldDecls.lookup(getter.name) + (existingGetter ne NoSymbol) && + ((site memberInfo existingGetter) matches (site memberInfo getter)) + } def newModuleVarMember(module: Symbol): TermSymbol = { val moduleVar = @@ -443,7 +443,7 @@ abstract class Fields extends InfoTransform with ast.TreeDSL with TypingTransfor } // don't cause conflicts, skip overridden accessors contributed by supertraits (only act on the last overriding one) // see pos/trait_fields_dependent_conflict.scala and neg/t1960.scala - else if (accessorConflictsExistingVal(member) || isOverriddenAccessor(member, clazz)) Nil + else if (getterConflictsExistingVal(member) || isOverriddenAccessor(member, clazz)) Nil else if (member hasFlag MODULE) { val moduleVar = newModuleVarMember(member) List(moduleVar, newModuleAccessor(member, clazz, moduleVar)) |