Skip to content

Commit a8234b8

Browse files
committed
Clean up
1 parent 02211d5 commit a8234b8

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ class ClassfileParser(
227227
if (method) Flags.Method | methodTranslation.flags(jflags)
228228
else fieldTranslation.flags(jflags)
229229
val name = pool.getName(in.nextChar)
230-
if (!sflags.isOneOf(Flags.PrivateOrArtifact) || name.value == "<init>") {
230+
if (!sflags.isOneOf(Flags.PrivateOrArtifact) || name.name == nme.CONSTRUCTOR) {
231231
val member = newSymbol(
232232
getOwner(jflags), name.name, sflags, memberCompleter,
233233
getPrivateWithin(jflags), coord = start)
@@ -322,7 +322,6 @@ class ClassfileParser(
322322
}
323323

324324
private def sigToType(sig: String, owner: Symbol = null, isVarargs: Boolean = false)(using Context): Type = {
325-
val sigChars = sig.toCharArray
326325
var index = 0
327326
val end = sig.length
328327
def accept(ch: Char): Unit = {
@@ -725,9 +724,6 @@ class ClassfileParser(
725724
* and implicitly current class' superclasses.
726725
*/
727726
private def enterOwnInnerClasses()(using Context): Unit = {
728-
def className(name: String): String =
729-
name.substring(name.lastIndexOf('.') + 1, name.length)
730-
731727
def enterClassAndModule(entry: InnerClassEntry, file: AbstractFile, jflags: Int) =
732728
SymbolLoaders.enterClassAndModule(
733729
getOwner(jflags),
@@ -765,7 +761,7 @@ class ClassfileParser(
765761
def scan(target: TypeName): Boolean = {
766762
in.bp = attrbp
767763
var i = 0
768-
while (i < attrs && pool.getName(in.nextChar).value != target.toString) {
764+
while (i < attrs && pool.getName(in.nextChar).name.toTypeName != target) {
769765
val attrLen = in.nextInt
770766
in.skip(attrLen)
771767
i += 1
@@ -893,7 +889,7 @@ class ClassfileParser(
893889
var j = 0
894890
while (j < nArgs) {
895891
val argName = pool.getName(in.nextChar)
896-
if (argName.value == nme.bytes.toString) {
892+
if (argName.name == nme.bytes) {
897893
if (attrClass == defn.ScalaSignatureAnnot)
898894
return unpickleScala(parseScalaSigBytes)
899895
else if (attrClass == defn.ScalaLongSignatureAnnot)

0 commit comments

Comments
 (0)