File tree 5 files changed +5
-15
lines changed
compiler/src/dotty/tools/dotc
library/src/scala/annotation/internal 5 files changed +5
-15
lines changed Original file line number Diff line number Diff line change @@ -128,7 +128,7 @@ object NameOps {
128
128
/** If flags is a ModuleClass but not a Package, add module class suffix */
129
129
def adjustIfModuleClass (flags : FlagSet ): N = likeSpacedN {
130
130
if (flags.is(ModuleClass , butNot = Package )) name.asTypeName.moduleClassName
131
- else name.toTermName.exclude( AvoidClashName )
131
+ else name.toTermName
132
132
}
133
133
134
134
/** The expanded name.
Original file line number Diff line number Diff line change @@ -17,13 +17,6 @@ object NameTags extends TastyFormat.NameTags {
17
17
18
18
final val INITIALIZER = 26 // A mixin initializer method
19
19
20
- final val AVOIDCLASH = 27 // Adds a suffix to avoid a name clash;
21
- // Used in FirstTransform for synthesized companion objects of classes
22
- // if they would clash with another value.
23
-
24
- final val DIRECT = 28 // Used by ShortCutImplicits for the name of methods that
25
- // implement implicit function result types directly.
26
-
27
20
final val FIELD = 29 // Used by Memoize to tag the name of a class member field.
28
21
29
22
final val EXTMETH = 30 // Used by ExtensionMethods for the name of an extension method
@@ -51,8 +44,6 @@ object NameTags extends TastyFormat.NameTags {
51
44
case INLINEACCESSOR => " INLINEACCESSOR"
52
45
case PROTECTEDACCESSOR => " PROTECTEDACCESSOR"
53
46
case INITIALIZER => " INITIALIZER"
54
- case AVOIDCLASH => " AVOIDCLASH"
55
- case DIRECT => " DIRECT"
56
47
case FIELD => " FIELD"
57
48
case EXTMETH => " EXTMETH"
58
49
case IMPLMETH => " IMPLMETH"
Original file line number Diff line number Diff line change @@ -282,7 +282,7 @@ object SymDenotations {
282
282
*/
283
283
def effectiveName (implicit ctx : Context ): Name =
284
284
if (this .is(ModuleClass )) name.stripModuleClassSuffix
285
- else name.exclude( AvoidClashName )
285
+ else name
286
286
287
287
/** The privateWithin boundary, NoSymbol if no boundary is given.
288
288
*/
Original file line number Diff line number Diff line change @@ -851,7 +851,7 @@ trait Checking {
851
851
typr.println(i " check no double declarations $cls" )
852
852
853
853
def checkDecl (decl : Symbol ): Unit = {
854
- for (other <- seen(decl.name) if ( ! decl.isAbsent() && ! other.isAbsent() )) {
854
+ for (other <- seen(decl.name) if ! decl.isAbsent() && ! other.isAbsent()) {
855
855
typr.println(i " conflict? $decl $other" )
856
856
def javaFieldMethodPair =
857
857
decl.is(JavaDefined ) && other.is(JavaDefined ) &&
Original file line number Diff line number Diff line change 1
- package scala .annotation .internal
2
-
3
- import scala .annotation .Annotation
1
+ package scala .annotation
2
+ package internal
4
3
5
4
/** An annotation to indicate a child class or object of the annotated class.
6
5
* E.g. if we have
You can’t perform that action at this time.
0 commit comments