Skip to content

Commit d528035

Browse files
committed
Applied review comments
Added suggested changes by myself and @smarter.
1 parent 3377de5 commit d528035

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/dotty/tools/dotc/ast/Trees.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ object Trees {
223223

224224
override def toText(printer: Printer) = printer.toText(this)
225225

226-
override def hashCode(): Int = uniqueId
226+
override def hashCode(): Int = uniqueId // for debugging; was: System.identityHashCode(this)
227227
override def equals(that: Any) = this eq that.asInstanceOf[AnyRef]
228228
}
229229

src/dotty/tools/dotc/core/Symbols.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ object Symbols {
504504
def showName(implicit ctx: Context): String = ctx.nameString(this)
505505
def showFullName(implicit ctx: Context): String = ctx.fullNameString(this)
506506

507-
override def hashCode() = id
507+
override def hashCode() = id // for debugging.
508508
}
509509

510510
type TermSymbol = Symbol { type ThisName = TermName }

src/dotty/tools/dotc/transform/Mixin.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ class Mixin extends MiniPhaseTransform with SymTransformer { thisTransform =>
109109

110110
private def initializer(sym: Symbol)(implicit ctx: Context): TermSymbol = {
111111
val initName = if(!sym.is(Lazy)) InitializerName(sym.name.asTermName) else sym.name.asTermName
112-
def hasSameLaziness(s: Symbol) = if(sym.is(Lazy)) s.is(Lazy) else !s.is(Lazy)
113-
sym.owner.info.decl(initName).suchThat(hasSameLaziness).symbol
112+
sym.owner.info.decl(initName).suchThat(_.is(Lazy) == sym.is(Lazy)).symbol
114113
.orElse(
115114
ctx.newSymbol(
116115
sym.owner,

0 commit comments

Comments
 (0)