Skip to content

Commit 5c4496a

Browse files
committed
Refactor code into nested method
mergeDenot is already large as it is.
1 parent 7ec75f3 commit 5c4496a

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -339,17 +339,18 @@ object Denotations {
339339
def prefer(sym1: Symbol, sym2: Symbol, info1: Type, info2: Type) =
340340
preferSym(sym1, sym2) && info1.overrides(info2)
341341

342+
def handleDoubleDef =
343+
if (preferSym(sym1, sym2)) denot1
344+
else if (preferSym(sym2, sym1)) denot2
345+
else doubleDefError(denot1, denot2, pre)
346+
342347
if (sym2Accessible && prefer(sym2, sym1, info2, info1)) denot2
343348
else {
344349
val sym1Accessible = sym1.isAccessibleFrom(pre)
345350
if (sym1Accessible && prefer(sym1, sym2, info1, info2)) denot1
346351
else if (sym1Accessible && sym2.exists && !sym2Accessible) denot1
347352
else if (sym2Accessible && sym1.exists && !sym1Accessible) denot2
348-
else if (isDoubleDef(sym1, sym2)) {
349-
if (preferSym(sym1, sym2)) denot1
350-
else if (preferSym(sym2, sym1)) denot2
351-
else doubleDefError(denot1, denot2, pre)
352-
}
353+
else if (isDoubleDef(sym1, sym2)) handleDoubleDef
353354
else {
354355
val sym =
355356
if (!sym1.exists) sym2

0 commit comments

Comments
 (0)