[IR generator] Use TypeKind from the common module, share it with FIR
This is a step towards commonizing the code generator between FIR and IR: KT-61970
This commit is contained in:
committed by
Space Team
parent
0dd01279da
commit
af5a93f5ff
+1
-1
@@ -5,13 +5,13 @@
|
||||
|
||||
package org.jetbrains.kotlin.ir.generator
|
||||
|
||||
import org.jetbrains.kotlin.generators.tree.TypeKind
|
||||
import org.jetbrains.kotlin.ir.generator.Packages.declarations
|
||||
import org.jetbrains.kotlin.ir.generator.Packages.exprs
|
||||
import org.jetbrains.kotlin.ir.generator.Packages.symbols
|
||||
import org.jetbrains.kotlin.ir.generator.Packages.tree
|
||||
import org.jetbrains.kotlin.ir.generator.Packages.types
|
||||
import org.jetbrains.kotlin.ir.generator.Packages.visitors
|
||||
import org.jetbrains.kotlin.ir.generator.util.TypeKind
|
||||
import org.jetbrains.kotlin.ir.generator.util.type
|
||||
|
||||
object Packages {
|
||||
|
||||
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind
|
||||
import org.jetbrains.kotlin.descriptors.Modality
|
||||
import org.jetbrains.kotlin.descriptors.SourceElement
|
||||
import org.jetbrains.kotlin.descriptors.ValueClassRepresentation
|
||||
import org.jetbrains.kotlin.generators.tree.TypeKind
|
||||
import org.jetbrains.kotlin.ir.generator.config.AbstractTreeBuilder
|
||||
import org.jetbrains.kotlin.ir.generator.config.ElementConfig
|
||||
import org.jetbrains.kotlin.ir.generator.config.ElementConfig.Category.*
|
||||
|
||||
+1
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.ir.generator.config
|
||||
import com.squareup.kotlinpoet.CodeBlock
|
||||
import com.squareup.kotlinpoet.PropertySpec
|
||||
import com.squareup.kotlinpoet.TypeSpec
|
||||
import org.jetbrains.kotlin.generators.tree.TypeKind
|
||||
import org.jetbrains.kotlin.ir.generator.BASE_PACKAGE
|
||||
import org.jetbrains.kotlin.ir.generator.util.*
|
||||
|
||||
|
||||
+1
@@ -6,6 +6,7 @@
|
||||
package org.jetbrains.kotlin.ir.generator.model
|
||||
|
||||
import com.squareup.kotlinpoet.CodeBlock
|
||||
import org.jetbrains.kotlin.generators.tree.TypeKind
|
||||
import org.jetbrains.kotlin.ir.generator.config.ElementConfig
|
||||
import org.jetbrains.kotlin.ir.generator.config.FieldConfig
|
||||
import org.jetbrains.kotlin.ir.generator.util.*
|
||||
|
||||
+1
@@ -5,6 +5,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.ir.generator.model
|
||||
|
||||
import org.jetbrains.kotlin.generators.tree.TypeKind
|
||||
import org.jetbrains.kotlin.ir.generator.config.*
|
||||
import org.jetbrains.kotlin.ir.generator.elementBaseType
|
||||
import org.jetbrains.kotlin.ir.generator.util.*
|
||||
|
||||
+1
-1
@@ -5,9 +5,9 @@
|
||||
|
||||
package org.jetbrains.kotlin.ir.generator.model
|
||||
|
||||
import org.jetbrains.kotlin.generators.tree.TypeKind
|
||||
import org.jetbrains.kotlin.generators.util.Node
|
||||
import org.jetbrains.kotlin.generators.util.solveGraphForClassVsInterface
|
||||
import org.jetbrains.kotlin.ir.generator.util.TypeKind
|
||||
|
||||
private class NodeImpl(val element: Element) : Node {
|
||||
override val parents: List<Node>
|
||||
|
||||
+1
-1
@@ -6,11 +6,11 @@
|
||||
package org.jetbrains.kotlin.ir.generator.print
|
||||
|
||||
import com.squareup.kotlinpoet.*
|
||||
import org.jetbrains.kotlin.generators.tree.TypeKind
|
||||
import org.jetbrains.kotlin.ir.generator.BASE_PACKAGE
|
||||
import org.jetbrains.kotlin.ir.generator.elementTransformerType
|
||||
import org.jetbrains.kotlin.ir.generator.elementVisitorType
|
||||
import org.jetbrains.kotlin.ir.generator.model.*
|
||||
import org.jetbrains.kotlin.ir.generator.util.TypeKind
|
||||
import org.jetbrains.kotlin.ir.generator.util.TypeRefWithNullability
|
||||
import org.jetbrains.kotlin.ir.generator.util.tryParameterizedBy
|
||||
import java.io.File
|
||||
|
||||
+1
@@ -6,6 +6,7 @@
|
||||
package org.jetbrains.kotlin.ir.generator.print
|
||||
|
||||
import com.squareup.kotlinpoet.*
|
||||
import org.jetbrains.kotlin.generators.tree.TypeKind
|
||||
import org.jetbrains.kotlin.ir.generator.config.ElementConfigOrRef
|
||||
import org.jetbrains.kotlin.ir.generator.model.Element
|
||||
import org.jetbrains.kotlin.ir.generator.model.Element.Companion.elementName2typeName
|
||||
|
||||
+1
-5
@@ -6,6 +6,7 @@
|
||||
package org.jetbrains.kotlin.ir.generator.util
|
||||
|
||||
import com.squareup.kotlinpoet.asClassName
|
||||
import org.jetbrains.kotlin.generators.tree.TypeKind
|
||||
import org.jetbrains.kotlin.types.Variance
|
||||
import java.util.*
|
||||
import kotlin.reflect.KClass
|
||||
@@ -121,8 +122,3 @@ inline fun <reified T : Any> type(vararg args: TypeRef) = T::class.asRef<Positio
|
||||
|
||||
fun type(packageName: String, name: String, kind: TypeKind = TypeKind.Interface) =
|
||||
ClassRef<PositionTypeParameterRef>(kind, packageName, name)
|
||||
|
||||
enum class TypeKind {
|
||||
Class,
|
||||
Interface
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user