azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JVM IR: minor, use chars from JvmSimpleNameBacktickChecker in ClassCodegen

Browse Source
This commit is contained in:
Alexander Udalov
2020-01-14 13:53:08 +01:00
parent be228d594c
commit 04a6f4d92b
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmSimpleNameBacktickChecker.kt
+3 -6
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.IdentifierChecker
object JvmSimpleNameBacktickChecker : IdentifierChecker {
// See The Java Virtual Machine Specification, section 4.7.9.1 https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.9.1
private val CHARS = setOf('.', ';', '[', ']', '/', '<', '>', ':', '\\')
val INVALID_CHARS = setOf('.', ';', '[', ']', '/', '<', '>', ':', '\\')
override fun checkIdentifier(simpleNameExpression: KtSimpleNameExpression, diagnosticHolder: DiagnosticSink) {
reportIfNeeded(simpleNameExpression.getReferencedName(), { simpleNameExpression.getIdentifier() }, diagnosticHolder)
@@ -55,16 +55,13 @@ object JvmSimpleNameBacktickChecker : IdentifierChecker {
val text = KtPsiUtil.unquoteIdentifier(name)
if (text.isEmpty()) {
diagnosticHolder.report(Errors.INVALID_CHARACTERS.on(reportOn() ?: return, "should not be empty"))
} else if (text.any { it in CHARS }) {
} else if (text.any { it in INVALID_CHARS }) {
diagnosticHolder.report(
Errors.INVALID_CHARACTERS.on(
reportOn() ?: return,
"contains illegal characters: ${CHARS.intersect(text.toSet()).joinToString(
""
)}"
"contains illegal characters: ${INVALID_CHARS.intersect(text.toSet()).joinToString("")}"
)
)
}
}
}