[Commonizer] Minor. Reorder type params for CirNode
This commit is contained in:
+1
-1
@@ -13,7 +13,7 @@ class CirClassConstructorNode(
|
|||||||
override val targetDeclarations: CommonizedGroup<CirClassConstructor>,
|
override val targetDeclarations: CommonizedGroup<CirClassConstructor>,
|
||||||
override val commonDeclaration: NullableLazyValue<CirClassConstructor>
|
override val commonDeclaration: NullableLazyValue<CirClassConstructor>
|
||||||
) : CirNode<CirClassConstructor, CirClassConstructor> {
|
) : CirNode<CirClassConstructor, CirClassConstructor> {
|
||||||
override fun <R, T> accept(visitor: CirNodeVisitor<R, T>, data: T): R =
|
override fun <T, R> accept(visitor: CirNodeVisitor<T, R>, data: T): R =
|
||||||
visitor.visitClassConstructorNode(this, data)
|
visitor.visitClassConstructorNode(this, data)
|
||||||
|
|
||||||
override fun toString() = CirNode.toString(this)
|
override fun toString() = CirNode.toString(this)
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ class CirClassNode(
|
|||||||
val functions: MutableMap<FunctionApproximationKey, CirFunctionNode> = THashMap()
|
val functions: MutableMap<FunctionApproximationKey, CirFunctionNode> = THashMap()
|
||||||
val classes: MutableMap<Name, CirClassNode> = THashMap()
|
val classes: MutableMap<Name, CirClassNode> = THashMap()
|
||||||
|
|
||||||
override fun <R, T> accept(visitor: CirNodeVisitor<R, T>, data: T): R =
|
override fun <T, R> accept(visitor: CirNodeVisitor<T, R>, data: T): R =
|
||||||
visitor.visitClassNode(this, data)
|
visitor.visitClassNode(this, data)
|
||||||
|
|
||||||
override fun toString() = CirNode.toString(this)
|
override fun toString() = CirNode.toString(this)
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ class CirFunctionNode(
|
|||||||
override val targetDeclarations: CommonizedGroup<CirFunction>,
|
override val targetDeclarations: CommonizedGroup<CirFunction>,
|
||||||
override val commonDeclaration: NullableLazyValue<CirFunction>
|
override val commonDeclaration: NullableLazyValue<CirFunction>
|
||||||
) : CirNode<CirFunction, CirFunction> {
|
) : CirNode<CirFunction, CirFunction> {
|
||||||
override fun <R, T> accept(visitor: CirNodeVisitor<R, T>, data: T) =
|
override fun <T, R> accept(visitor: CirNodeVisitor<T, R>, data: T) =
|
||||||
visitor.visitFunctionNode(this, data)
|
visitor.visitFunctionNode(this, data)
|
||||||
|
|
||||||
override fun toString() = CirNode.toString(this)
|
override fun toString() = CirNode.toString(this)
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ class CirModuleNode(
|
|||||||
) : CirNode<CirModule, CirModule> {
|
) : CirNode<CirModule, CirModule> {
|
||||||
val packages: MutableMap<FqName, CirPackageNode> = THashMap()
|
val packages: MutableMap<FqName, CirPackageNode> = THashMap()
|
||||||
|
|
||||||
override fun <R, T> accept(visitor: CirNodeVisitor<R, T>, data: T) =
|
override fun <T, R> accept(visitor: CirNodeVisitor<T, R>, data: T) =
|
||||||
visitor.visitModuleNode(this, data)
|
visitor.visitModuleNode(this, data)
|
||||||
|
|
||||||
override fun toString() = CirNode.toString(this)
|
override fun toString() = CirNode.toString(this)
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ interface CirNode<T : CirDeclaration, R : CirDeclaration> {
|
|||||||
val targetDeclarations: CommonizedGroup<T>
|
val targetDeclarations: CommonizedGroup<T>
|
||||||
val commonDeclaration: NullableLazyValue<R>
|
val commonDeclaration: NullableLazyValue<R>
|
||||||
|
|
||||||
fun <R, T> accept(visitor: CirNodeVisitor<R, T>, data: T): R
|
fun <T, R> accept(visitor: CirNodeVisitor<T, R>, data: T): R
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
inline val CirNode<*, *>.indexOfCommon: Int
|
inline val CirNode<*, *>.indexOfCommon: Int
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
|
package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
|
||||||
|
|
||||||
interface CirNodeVisitor<R, T> {
|
interface CirNodeVisitor<T, R> {
|
||||||
fun visitRootNode(node: CirRootNode, data: T): R
|
fun visitRootNode(node: CirRootNode, data: T): R
|
||||||
fun visitModuleNode(node: CirModuleNode, data: T): R
|
fun visitModuleNode(node: CirModuleNode, data: T): R
|
||||||
fun visitPackageNode(node: CirPackageNode, data: T): R
|
fun visitPackageNode(node: CirPackageNode, data: T): R
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ class CirPackageNode(
|
|||||||
val classes: MutableMap<Name, CirClassNode> = THashMap()
|
val classes: MutableMap<Name, CirClassNode> = THashMap()
|
||||||
val typeAliases: MutableMap<Name, CirTypeAliasNode> = THashMap()
|
val typeAliases: MutableMap<Name, CirTypeAliasNode> = THashMap()
|
||||||
|
|
||||||
override fun <R, T> accept(visitor: CirNodeVisitor<R, T>, data: T) =
|
override fun <T, R> accept(visitor: CirNodeVisitor<T, R>, data: T) =
|
||||||
visitor.visitPackageNode(this, data)
|
visitor.visitPackageNode(this, data)
|
||||||
|
|
||||||
override fun toString() = CirNode.toString(this)
|
override fun toString() = CirNode.toString(this)
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ class CirPropertyNode(
|
|||||||
override val targetDeclarations: CommonizedGroup<CirProperty>,
|
override val targetDeclarations: CommonizedGroup<CirProperty>,
|
||||||
override val commonDeclaration: NullableLazyValue<CirProperty>
|
override val commonDeclaration: NullableLazyValue<CirProperty>
|
||||||
) : CirNode<CirProperty, CirProperty> {
|
) : CirNode<CirProperty, CirProperty> {
|
||||||
override fun <R, T> accept(visitor: CirNodeVisitor<R, T>, data: T) =
|
override fun <T, R> accept(visitor: CirNodeVisitor<T, R>, data: T) =
|
||||||
visitor.visitPropertyNode(this, data)
|
visitor.visitPropertyNode(this, data)
|
||||||
|
|
||||||
override fun toString() = CirNode.toString(this)
|
override fun toString() = CirNode.toString(this)
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ class CirRootNode(
|
|||||||
val modules: MutableMap<Name, CirModuleNode> = THashMap()
|
val modules: MutableMap<Name, CirModuleNode> = THashMap()
|
||||||
val cache = CirClassifiersCacheImpl()
|
val cache = CirClassifiersCacheImpl()
|
||||||
|
|
||||||
override fun <R, T> accept(visitor: CirNodeVisitor<R, T>, data: T): R =
|
override fun <T, R> accept(visitor: CirNodeVisitor<T, R>, data: T): R =
|
||||||
visitor.visitRootNode(this, data)
|
visitor.visitRootNode(this, data)
|
||||||
|
|
||||||
override fun toString() = CirNode.toString(this)
|
override fun toString() = CirNode.toString(this)
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ class CirTypeAliasNode(
|
|||||||
override val classId: ClassId
|
override val classId: ClassId
|
||||||
) : CirNodeWithClassId<CirTypeAlias, CirClassifier> {
|
) : CirNodeWithClassId<CirTypeAlias, CirClassifier> {
|
||||||
|
|
||||||
override fun <R, T> accept(visitor: CirNodeVisitor<R, T>, data: T): R =
|
override fun <T, R> accept(visitor: CirNodeVisitor<T, R>, data: T): R =
|
||||||
visitor.visitTypeAliasNode(this, data)
|
visitor.visitTypeAliasNode(this, data)
|
||||||
|
|
||||||
override fun toString() = CirNode.toString(this)
|
override fun toString() = CirNode.toString(this)
|
||||||
|
|||||||
Reference in New Issue
Block a user