[Commonizer] Minor. Reorder type params for CirNode

This commit is contained in:
Dmitriy Dolovov
2020-07-08 14:39:17 +07:00
parent c37f339d8c
commit 7a283c64cb
10 changed files with 10 additions and 10 deletions
@@ -13,7 +13,7 @@ class CirClassConstructorNode(
override val targetDeclarations: CommonizedGroup<CirClassConstructor>,
override val commonDeclaration: NullableLazyValue<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)
override fun toString() = CirNode.toString(this)
@@ -23,7 +23,7 @@ class CirClassNode(
val functions: MutableMap<FunctionApproximationKey, CirFunctionNode> = 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)
override fun toString() = CirNode.toString(this)
@@ -13,7 +13,7 @@ class CirFunctionNode(
override val targetDeclarations: CommonizedGroup<CirFunction>,
override val commonDeclaration: NullableLazyValue<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)
override fun toString() = CirNode.toString(this)
@@ -17,7 +17,7 @@ class CirModuleNode(
) : CirNode<CirModule, CirModule> {
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)
override fun toString() = CirNode.toString(this)
@@ -13,7 +13,7 @@ interface CirNode<T : CirDeclaration, R : CirDeclaration> {
val targetDeclarations: CommonizedGroup<T>
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 {
inline val CirNode<*, *>.indexOfCommon: Int
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
interface CirNodeVisitor<R, T> {
interface CirNodeVisitor<T, R> {
fun visitRootNode(node: CirRootNode, data: T): R
fun visitModuleNode(node: CirModuleNode, data: T): R
fun visitPackageNode(node: CirPackageNode, data: T): R
@@ -24,7 +24,7 @@ class CirPackageNode(
val classes: MutableMap<Name, CirClassNode> = 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)
override fun toString() = CirNode.toString(this)
@@ -13,7 +13,7 @@ class CirPropertyNode(
override val targetDeclarations: CommonizedGroup<CirProperty>,
override val commonDeclaration: NullableLazyValue<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)
override fun toString() = CirNode.toString(this)
@@ -24,7 +24,7 @@ class CirRootNode(
val modules: MutableMap<Name, CirModuleNode> = THashMap()
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)
override fun toString() = CirNode.toString(this)
@@ -17,7 +17,7 @@ class CirTypeAliasNode(
override val classId: ClassId
) : 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)
override fun toString() = CirNode.toString(this)