@@ -58,7 +58,7 @@ object NameOps {
58
58
case _ => false
59
59
}
60
60
61
- private def likeSpaced (n : PreName ): N =
61
+ private def likeSpacedN (n : PreName ): N =
62
62
name.likeSpaced(n).asInstanceOf [N ]
63
63
64
64
def isConstructorName = name == CONSTRUCTOR || name == TRAIT_CONSTRUCTOR
@@ -100,7 +100,7 @@ object NameOps {
100
100
* method needs to work on mangled as well as unmangled names because
101
101
* it is also called from the backend.
102
102
*/
103
- def stripModuleClassSuffix : N = likeSpaced {
103
+ def stripModuleClassSuffix : N = likeSpacedN {
104
104
val semName = name.toTermName match {
105
105
case name : SimpleName if name.endsWith(" $" ) => name.unmangleClassName
106
106
case _ => name
@@ -109,7 +109,7 @@ object NameOps {
109
109
}
110
110
111
111
/** If flags is a ModuleClass but not a Package, add module class suffix */
112
- def adjustIfModuleClass (flags : Flags .FlagSet ): N = likeSpaced {
112
+ def adjustIfModuleClass (flags : Flags .FlagSet ): N = likeSpacedN {
113
113
if (flags is (ModuleClass , butNot = Package )) name.asTypeName.moduleClassName
114
114
else name.toTermName.exclude(AvoidClashName )
115
115
}
@@ -119,27 +119,27 @@ object NameOps {
119
119
* followed by `kind` and the name.
120
120
*/
121
121
def expandedName (base : Symbol , kind : QualifiedNameKind = ExpandedName )(implicit ctx : Context ): N =
122
- likeSpaced { base.fullNameSeparated(ExpandPrefixName , kind, name) }
122
+ likeSpacedN { base.fullNameSeparated(ExpandPrefixName , kind, name) }
123
123
124
124
/** Revert the expanded name. */
125
- def unexpandedName : N = likeSpaced {
125
+ def unexpandedName : N = likeSpacedN {
126
126
name.rewrite { case ExpandedName (_, unexp) => unexp }
127
127
}
128
128
129
129
/** Remove the variance from the name. */
130
- def invariantName : N = likeSpaced {
130
+ def invariantName : N = likeSpacedN {
131
131
name.rewrite { case VariantName (invariant, _) => invariant }
132
132
}
133
133
134
- def implClassName : N = likeSpaced (name ++ tpnme.IMPL_CLASS_SUFFIX )
134
+ def implClassName : N = likeSpacedN (name ++ tpnme.IMPL_CLASS_SUFFIX )
135
135
136
136
def traitOfImplClassName : N = {
137
137
val suffix = tpnme.IMPL_CLASS_SUFFIX .toString
138
138
assert(name.endsWith(suffix), name)
139
- likeSpaced (name.mapLast(_.dropRight(suffix.length)))
139
+ likeSpacedN (name.mapLast(_.dropRight(suffix.length)))
140
140
}
141
141
142
- def errorName : N = likeSpaced (name ++ nme.ERROR )
142
+ def errorName : N = likeSpacedN (name ++ nme.ERROR )
143
143
144
144
/** Map variance value -1, +1 to 0, 1 */
145
145
private def varianceToNat (v : Int ) = (v + 1 ) / 2
@@ -150,7 +150,7 @@ object NameOps {
150
150
/** Name with variance prefix: `+` for covariant, `-` for contravariant */
151
151
def withVariance (v : Int ): N = {
152
152
val underlying = name.exclude(VariantName )
153
- likeSpaced (
153
+ likeSpacedN (
154
154
if (v == 0 ) underlying
155
155
else VariantName (underlying.toTermName, varianceToNat(v)))
156
156
}
@@ -160,7 +160,7 @@ object NameOps {
160
160
*/
161
161
def variance = name.collect { case VariantName (_, n) => natToVariance(n) }.getOrElse(0 )
162
162
163
- def freshened (implicit ctx : Context ): N = likeSpaced {
163
+ def freshened (implicit ctx : Context ): N = likeSpacedN {
164
164
name.toTermName match {
165
165
case ModuleClassName (original) => ModuleClassName (original.freshened)
166
166
case name => UniqueName .fresh(name)
@@ -238,7 +238,7 @@ object NameOps {
238
238
val methodTags : Seq [Name ] = (methodTargs zip methodTarsNames).sortBy(_._2).map(x => defn.typeTag(x._1))
239
239
val classTags : Seq [Name ] = (classTargs zip classTargsNames).sortBy(_._2).map(x => defn.typeTag(x._1))
240
240
241
- likeSpaced (name ++ nme.specializedTypeNames.prefix ++
241
+ likeSpacedN (name ++ nme.specializedTypeNames.prefix ++
242
242
methodTags.fold(nme.EMPTY )(_ ++ _) ++ nme.specializedTypeNames.separator ++
243
243
classTags.fold(nme.EMPTY )(_ ++ _) ++ nme.specializedTypeNames.suffix)
244
244
}
@@ -249,11 +249,11 @@ object NameOps {
249
249
def unmangleClassName : N = name.toTermName match {
250
250
case name : SimpleName
251
251
if name.endsWith(str.MODULE_SUFFIX ) && ! nme.falseModuleClassNames.contains(name) =>
252
- likeSpaced (name.dropRight(str.MODULE_SUFFIX .length).moduleClassName)
252
+ likeSpacedN (name.dropRight(str.MODULE_SUFFIX .length).moduleClassName)
253
253
case _ => name
254
254
}
255
255
256
- def unmangle (kind : NameKind ): N = likeSpaced {
256
+ def unmangle (kind : NameKind ): N = likeSpacedN {
257
257
name rewrite {
258
258
case unmangled : SimpleName =>
259
259
kind.unmangle(unmangled)
0 commit comments