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

[JS IR] switch to the IC Ir2Js and fix tests

Browse Source
This commit is contained in:
Anton Bannykh
2021-11-24 18:35:59 +03:00
committed by TeamCityServer
parent 4386a800c8
commit ef4ef8c930
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelToJsStatements.kt
+1 -1
View File
@@ -101,7 +101,7 @@ class ExportModelToJsStatements(
val newNameSpace = if (namespace != null)
jsElementAccess(declaration.name, namespace)
else
JsNameRef(Namer.PROTOTYPE_NAME, declaration.name)
JsNameRef(Namer.PROTOTYPE_NAME, namer.getNameForClass(declaration.ir).makeRef())
val name = namer.getNameForStaticDeclaration(declaration.ir)
val klassExport =
if (esModules) {
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsNameLinkingNamer.kt
+18 -7
View File
@@ -33,7 +33,7 @@ class JsNameLinkingNamer(private val context: JsIrBackendContext) : IrNamerBase(
val jsModule: String? = declaration.getJsModule()
val maybeParentFile: IrFile? = declaration.parent as? IrFile
val fileJsModule: String? = maybeParentFile?.getJsModule()
val jsQualifier: String? = maybeParentFile?.getJsQualifier()
val jsQualifier: List<JsName>? = maybeParentFile?.getJsQualifier()?.split('.')?.map { JsName(it, false) }
when {
jsModule != null -> {
@@ -44,19 +44,22 @@ class JsNameLinkingNamer(private val context: JsIrBackendContext) : IrNamerBase(
fileJsModule != null -> {
if (declaration !in nameMap) {
val moduleName = JsName("\$module\$$jsModule", true)
val moduleName = JsName(sanitizeName("\$module\$$fileJsModule"), true)
importedModules += JsImportedModule(fileJsModule, moduleName, null)
val qualifiedReference =
if (jsQualifier == null) moduleName.makeRef() else JsNameRef(jsQualifier, moduleName.makeRef())
imports[declaration] = JsNameRef(declaration.getJsNameOrKotlinName().identifier, qualifiedReference)
if (jsQualifier == null) moduleName.makeRef() else (listOf(moduleName) + jsQualifier).makeRef()
imports[declaration] = jsElementAccess(declaration.getJsNameOrKotlinName().identifier, qualifiedReference)
return declaration.getName()
}
}
else -> {
var name = declaration.getJsNameOrKotlinName().identifier
if (jsQualifier != null)
name = "$jsQualifier.$name"
val name = declaration.getJsNameOrKotlinName().identifier
if (jsQualifier != null) {
imports[declaration] = jsElementAccess(name, jsQualifier.makeRef())
return declaration.getName()
}
return name.toJsName(temporary = false)
}
@@ -117,4 +120,12 @@ private fun IrField.safeName(): String {
return sanitizeName(name.asString()).let {
if (it.lastOrNull()!!.isDigit()) it + "_" else it // Avoid name clashes
}
}
private fun List<JsName>.makeRef(): JsNameRef {
var result = this[0].makeRef()
for (i in 1 until this.size) {
result = JsNameRef(this[i], result)
}
return result
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/resolveTemporaryNames.kt
-15
View File
@@ -8,21 +8,6 @@ package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs
import org.jetbrains.kotlin.js.backend.ast.*
fun JsNode.resolveTemporaryNames() {
object : JsVisitorWithContextImpl() {
override fun endVisit(x: JsNameRef, ctx: JsContext<JsNode>) {
x.name?.ident?.let {
if (it.contains('.')) {
val parts = it.split('.').map { JsName(it, false) }
var result = JsNameRef(parts[0])
for (i in 1 until parts.size) {
result = JsNameRef(parts[i], result)
}
ctx.replaceMe(result)
}
}
}
}.accept(this)
val renamings = resolveNames()
accept(object : RecursiveJsVisitor() {
override fun visitElement(node: JsNode) {