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

chore: use CompositeBlock instead of GlobalBlock.

Browse Source
This commit is contained in:
Artem Kobzar
2022-03-16 16:18:19 +01:00
committed by teamcity
parent c6136619d2
commit 7ef14fc11b
28 changed files with 374 additions and 1049 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/InlineFunctionContext.kt
+4 -4
View File
@@ -17,12 +17,12 @@
package org.jetbrains.kotlin.js.translate.context
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.js.backend.ast.JsGlobalBlock
import org.jetbrains.kotlin.js.backend.ast.JsCompositeBlock
import org.jetbrains.kotlin.js.backend.ast.JsName
class InlineFunctionContext(val descriptor: CallableDescriptor) {
val imports = mutableMapOf<String, JsName>()
val importBlock = JsGlobalBlock()
val prototypeBlock = JsGlobalBlock()
val declarationsBlock = JsGlobalBlock()
val importBlock = JsCompositeBlock()
val prototypeBlock = JsCompositeBlock()
val declarationsBlock = JsCompositeBlock()
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Merger.kt
+4 -4
View File
@@ -43,12 +43,12 @@ class Merger(
private val nameTable = mutableMapOf<String, JsName>()
private val importedModuleTable = mutableMapOf<JsImportedModuleKey, JsName>()
private val importBlock = JsGlobalBlock()
private val declarationBlock = JsGlobalBlock()
private val initializerBlock = JsGlobalBlock()
private val importBlock = JsCompositeBlock()
private val declarationBlock = JsCompositeBlock()
private val initializerBlock = JsCompositeBlock()
private val testsMap = mutableMapOf<String, JsStatement>()
private var mainFn: Pair<String, JsStatement>? = null
private val exportBlock = JsGlobalBlock()
private val exportBlock = JsCompositeBlock()
private val declaredImports = mutableSetOf<String>()
private val classes = mutableMapOf<JsName, JsClassModel>()
private val importedModulesImpl = mutableListOf<JsImportedModule>()