@@ -131,7 +131,7 @@ class Namer { typer: Typer =>
131
131
* The logic here is very subtle and fragile due to the fact that
132
132
* we are not allowed to force anything.
133
133
*/
134
- def checkNoConflict (name : Name , isPrivate : Boolean , span : Span )(using Context ): Name =
134
+ def checkNoConflict (name : Name , span : Span )(using Context ): Name =
135
135
val owner = ctx.owner
136
136
var conflictsDetected = false
137
137
@@ -166,7 +166,7 @@ class Namer { typer: Typer =>
166
166
def preExisting = ctx.effectiveScope.lookup(name)
167
167
if (! owner.isClass || name.isTypeName) && preExisting.exists then
168
168
conflict(preExisting)
169
- else if owner.isPackageObject && ! isPrivate && name != nme.CONSTRUCTOR then
169
+ else if owner.isPackageObject && name != nme.CONSTRUCTOR then
170
170
checkNoConflictIn(owner.owner)
171
171
for pkgObj <- pkgObjs(owner.owner) if pkgObj != owner do
172
172
checkNoConflictIn(pkgObj)
@@ -242,7 +242,7 @@ class Namer { typer: Typer =>
242
242
tree match {
243
243
case tree : TypeDef if tree.isClassDef =>
244
244
val flags = checkFlags(tree.mods.flags)
245
- val name = checkNoConflict(tree.name, flags.is( Private ), tree.span).asTypeName
245
+ val name = checkNoConflict(tree.name, tree.span).asTypeName
246
246
val cls =
247
247
createOrRefine[ClassSymbol ](tree, name, flags, ctx.owner,
248
248
cls => adjustIfModule(new ClassCompleter (cls, tree)(ctx), tree),
@@ -251,7 +251,7 @@ class Namer { typer: Typer =>
251
251
cls
252
252
case tree : MemberDef =>
253
253
var flags = checkFlags(tree.mods.flags)
254
- val name = checkNoConflict(tree.name, flags.is( Private ), tree.span)
254
+ val name = checkNoConflict(tree.name, tree.span)
255
255
tree match
256
256
case tree : ValOrDefDef =>
257
257
if tree.isInstanceOf [ValDef ] && ! flags.is(Param ) && name.endsWith(" _=" ) then
@@ -1217,7 +1217,7 @@ class Namer { typer: Typer =>
1217
1217
val hasDefaults = sym.hasDefaultParams // compute here to ensure HasDefaultParams and NoDefaultParams flags are set
1218
1218
val forwarder =
1219
1219
if mbr.isType then
1220
- val forwarderName = checkNoConflict(alias.toTypeName, isPrivate = false , span)
1220
+ val forwarderName = checkNoConflict(alias.toTypeName, span)
1221
1221
var target = pathType.select(sym)
1222
1222
if target.typeParams.nonEmpty then
1223
1223
target = target.EtaExpand (target.typeParams)
@@ -1271,7 +1271,7 @@ class Namer { typer: Typer =>
1271
1271
(EmptyFlags , mbrInfo)
1272
1272
var mbrFlags = MandatoryExportTermFlags | maybeStable | (sym.flags & RetainedExportTermFlags )
1273
1273
if pathMethod.exists then mbrFlags |= ExtensionMethod
1274
- val forwarderName = checkNoConflict(alias, isPrivate = false , span)
1274
+ val forwarderName = checkNoConflict(alias, span)
1275
1275
newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span)
1276
1276
1277
1277
forwarder.info = avoidPrivateLeaks(forwarder)
0 commit comments