From a25e781ee902798fdf3e2db85a81226e654d086a Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 13 Sep 2016 14:34:40 +0300 Subject: [PATCH] Minor: IrFieldAccessExpression, visitor methods. --- .../psi2ir/transformations/InsertImplicitCasts.kt | 2 +- ...FieldExpression.kt => IrFieldAccessExpression.kt} | 6 +++--- .../ir/expressions/impl/IrFieldExpressionBase.kt | 4 ++-- .../jetbrains/kotlin/ir/visitors/IrElementVisitor.kt | 6 +++--- .../kotlin/ir/visitors/IrElementVisitorVoid.kt | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) rename compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/{IrFieldExpression.kt => IrFieldAccessExpression.kt} (85%) diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt index b85551319ca..74296ebeb48 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt @@ -79,7 +79,7 @@ class InsertImplicitCasts(val builtIns: KotlinBuiltIns): IrElementVisitorVoid { expression.value.replaceWithCast(expression.descriptor.type) } - override fun visitSetBackingField(expression: IrSetField) { + override fun visitSetField(expression: IrSetField) { expression.acceptChildrenVoid(this) expression.value.replaceWithCast(expression.descriptor.type) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFieldExpression.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFieldAccessExpression.kt similarity index 85% rename from compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFieldExpression.kt rename to compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFieldAccessExpression.kt index 094b5688b79..08ab0619ad6 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFieldExpression.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrFieldAccessExpression.kt @@ -19,15 +19,15 @@ package org.jetbrains.kotlin.ir.expressions import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor -interface IrFieldExpression : IrDeclarationReference { +interface IrFieldAccessExpression : IrDeclarationReference { override val descriptor: PropertyDescriptor val superQualifier: ClassDescriptor? var receiver: IrExpression? val operator: IrOperator? } -interface IrGetField : IrFieldExpression +interface IrGetField : IrFieldAccessExpression -interface IrSetField : IrFieldExpression { +interface IrSetField : IrFieldAccessExpression { var value: IrExpression } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFieldExpressionBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFieldExpressionBase.kt index d7481ef4462..5822ec6eca9 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFieldExpressionBase.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrFieldExpressionBase.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.ir.expressions.impl import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.ir.* -import org.jetbrains.kotlin.ir.expressions.IrFieldExpression +import org.jetbrains.kotlin.ir.expressions.IrFieldAccessExpression import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.expressions.IrOperator import org.jetbrains.kotlin.types.KotlinType @@ -31,7 +31,7 @@ abstract class IrFieldExpressionBase( type: KotlinType, override val operator: IrOperator? = null, override val superQualifier: ClassDescriptor? = null -) : IrDeclarationReferenceBase(startOffset, endOffset, type, descriptor), IrFieldExpression { +) : IrDeclarationReferenceBase(startOffset, endOffset, type, descriptor), IrFieldAccessExpression { override final var receiver: IrExpression? = null set(value) { field?.detach() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitor.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitor.kt index 63e6f0e27e2..a21daa916ca 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitor.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitor.kt @@ -60,9 +60,9 @@ interface IrElementVisitor { fun visitVariableAccess(expression: IrVariableAccessExpression, data: D) = visitDeclarationReference(expression, data) fun visitGetVariable(expression: IrGetVariable, data: D) = visitVariableAccess(expression, data) fun visitSetVariable(expression: IrSetVariable, data: D) = visitVariableAccess(expression, data) - fun visitBackingFieldReference(expression: IrFieldExpression, data: D) = visitDeclarationReference(expression, data) - fun visitGetField(expression: IrGetField, data: D) = visitBackingFieldReference(expression, data) - fun visitSetField(expression: IrSetField, data: D) = visitBackingFieldReference(expression, data) + fun visitFieldAccess(expression: IrFieldAccessExpression, data: D) = visitDeclarationReference(expression, data) + fun visitGetField(expression: IrGetField, data: D) = visitFieldAccess(expression, data) + fun visitSetField(expression: IrSetField, data: D) = visitFieldAccess(expression, data) fun visitGetExtensionReceiver(expression: IrGetExtensionReceiver, data: D) = visitDeclarationReference(expression, data) fun visitGeneralCall(expression: IrGeneralCall, data: D) = visitDeclarationReference(expression, data) fun visitCall(expression: IrCall, data: D) = visitGeneralCall(expression, data) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitorVoid.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitorVoid.kt index 189e8cab6c6..84c3517705c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitorVoid.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitorVoid.kt @@ -123,14 +123,14 @@ interface IrElementVisitorVoid : IrElementVisitor { fun visitSetVariable(expression: IrSetVariable) = visitVariableAccess(expression) override fun visitSetVariable(expression: IrSetVariable, data: Nothing?) = visitSetVariable(expression) - fun visitBackingFieldReference(expression: IrFieldExpression) = visitDeclarationReference(expression) - override fun visitBackingFieldReference(expression: IrFieldExpression, data: Nothing?) = visitBackingFieldReference(expression) + fun visitFieldAccess(expression: IrFieldAccessExpression) = visitDeclarationReference(expression) + override fun visitFieldAccess(expression: IrFieldAccessExpression, data: Nothing?) = visitFieldAccess(expression) - fun visitGetBackingField(expression: IrGetField) = visitBackingFieldReference(expression) - override fun visitGetField(expression: IrGetField, data: Nothing?) = visitGetBackingField(expression) + fun visitGetField(expression: IrGetField) = visitFieldAccess(expression) + override fun visitGetField(expression: IrGetField, data: Nothing?) = visitGetField(expression) - fun visitSetBackingField(expression: IrSetField) = visitBackingFieldReference(expression) - override fun visitSetField(expression: IrSetField, data: Nothing?) = visitSetBackingField(expression) + fun visitSetField(expression: IrSetField) = visitFieldAccess(expression) + override fun visitSetField(expression: IrSetField, data: Nothing?) = visitSetField(expression) fun visitGetExtensionReceiver(expression: IrGetExtensionReceiver) = visitDeclarationReference(expression) override fun visitGetExtensionReceiver(expression: IrGetExtensionReceiver, data: Nothing?) = visitGetExtensionReceiver(expression)