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

[JS IR] Optimize sanitization

Browse Source 
- Use direct function call instead of lambda
- Don't do anything for already valid names
This commit is contained in:
Svyatoslav Kuzmich
2020-11-12 13:47:00 +03:00
parent 2a424ad2af
commit 8be7e6064e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
+3 -2
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
import org.jetbrains.kotlin.ir.visitors.acceptVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid
import org.jetbrains.kotlin.js.naming.isES5IdentifierPart import org.jetbrains.kotlin.js.naming.isES5IdentifierPart
import org.jetbrains.kotlin.js.naming.isES5IdentifierStart import org.jetbrains.kotlin.js.naming.isES5IdentifierStart
import org.jetbrains.kotlin.js.naming.isValidES5Identifier
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
import java.util.* import java.util.*
@@ -44,7 +45,6 @@ private fun <T> mapToKey(declaration: T): String {
class NameTable<T>( class NameTable<T>(
val parent: NameTable<*>? = null, val parent: NameTable<*>? = null,
val reserved: MutableSet<String> = mutableSetOf(), val reserved: MutableSet<String> = mutableSetOf(),
val sanitizer: (String) -> String = ::sanitizeName,
val mappedNames: MutableMap<String, String>? = null val mappedNames: MutableMap<String, String>? = null
) { ) {
var finished = false var finished = false
@@ -65,7 +65,7 @@ class NameTable<T>(
} }
fun declareFreshName(declaration: T, suggestedName: String): String { fun declareFreshName(declaration: T, suggestedName: String): String {
val freshName = findFreshName(sanitizer(suggestedName)) val freshName = findFreshName(sanitizeName(suggestedName))
declareStableName(declaration, freshName) declareStableName(declaration, freshName)
return freshName return freshName
} }
@@ -424,6 +424,7 @@ class NameTables(
fun sanitizeName(name: String): String { fun sanitizeName(name: String): String {
if (name.isValidES5Identifier()) return name
if (name.isEmpty()) return "_" if (name.isEmpty()) return "_"
val first = name.first().let { if (it.isES5IdentifierStart()) it else '_' } val first = name.first().let { if (it.isES5IdentifierStart()) it else '_' }