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

[JS IR BE] Minor codegen refactoring

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2019-06-17 14:42:56 +03:00
parent 79d4b46d2b
commit 19b0bb8d0f
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt
+1 -1
View File
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.js.backend.ast.*
class IrDeclarationToJsTransformer : BaseIrElementToJsNodeTransformer<JsStatement, JsGenerationContext> { class IrDeclarationToJsTransformer : BaseIrElementToJsNodeTransformer<JsStatement, JsGenerationContext> {
override fun visitSimpleFunction(declaration: IrSimpleFunction, context: JsGenerationContext): JsStatement { override fun visitSimpleFunction(declaration: IrSimpleFunction, context: JsGenerationContext): JsStatement {
if (declaration.descriptor.isExpect) return JsEmpty // TODO: fix it in Psi2Ir require(!declaration.descriptor.isExpect)
return declaration.accept(IrFunctionToJsTransformer(), context).makeStmt() return declaration.accept(IrFunctionToJsTransformer(), context).makeStmt()
} }
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt
+1 -6
View File
@@ -5,11 +5,9 @@
package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs
import org.jetbrains.kotlin.backend.common.ir.isStatic
import org.jetbrains.kotlin.backend.common.onlyIf import org.jetbrains.kotlin.backend.common.onlyIf
import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.ir.backend.js.utils.JsGenerationContext import org.jetbrains.kotlin.ir.backend.js.utils.JsGenerationContext
import org.jetbrains.kotlin.ir.backend.js.utils.Namer import org.jetbrains.kotlin.ir.backend.js.utils.Namer
import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
@@ -21,7 +19,6 @@ import org.jetbrains.kotlin.ir.types.classifierOrFail
import org.jetbrains.kotlin.ir.types.isAny import org.jetbrains.kotlin.ir.types.isAny
import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.addIfNotNull
class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationContext) { class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationContext) {
@@ -37,8 +34,7 @@ class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationCo
private val classModel = JsClassModel(className, baseClassName) private val classModel = JsClassModel(className, baseClassName)
fun generate(): JsStatement { fun generate(): JsStatement {
assert(!irClass.descriptor.isExpect)
if (irClass.descriptor.isExpect) return JsEmpty // TODO: fix it in Psi2Ir
maybeGeneratePrimaryConstructor() maybeGeneratePrimaryConstructor()
val transformer = IrDeclarationToJsTransformer() val transformer = IrDeclarationToJsTransformer()
@@ -76,7 +72,6 @@ class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationCo
// TODO: Test export properties of throwable subtype // TODO: Test export properties of throwable subtype
if (!irClass.isInterface && !irClass.isEnumClass && !irClass.isEnumEntry) { if (!irClass.isInterface && !irClass.isEnumClass && !irClass.isEnumEntry) {
for (property in properties) { for (property in properties) {
if (property.getter?.extensionReceiverParameter != null || property.setter?.extensionReceiverParameter != null) if (property.getter?.extensionReceiverParameter != null || property.setter?.extensionReceiverParameter != null)
continue continue