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

Rename: ExpressionOrImplicitClassReceiver ---> ThisClassReceiver

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-11-17 12:18:51 +03:00
parent 59e54d1db1
commit 04569dd4af
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExpressionReceiver.kt
+1 -1
View File
@@ -38,7 +38,7 @@ interface ExpressionReceiver : ReceiverValue {
override val classDescriptor: ClassDescriptor, override val classDescriptor: ClassDescriptor,
expression: KtExpression, expression: KtExpression,
type: KotlinType type: KotlinType
) : ExpressionReceiverImpl(expression, type), ExpressionOrImplicitClassReceiver ) : ExpressionReceiverImpl(expression, type), ThisClassReceiver
fun create( fun create(
expression: KtExpression, expression: KtExpression,
core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java
+3 -3
View File
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionOrImplicitClassReceiver; import org.jetbrains.kotlin.resolve.scopes.receivers.ThisClassReceiver;
import org.jetbrains.kotlin.util.ModuleVisibilityHelper; import org.jetbrains.kotlin.util.ModuleVisibilityHelper;
import org.jetbrains.kotlin.utils.CollectionsKt; import org.jetbrains.kotlin.utils.CollectionsKt;
@@ -76,8 +76,8 @@ public class Visibilities {
if (PRIVATE.isVisible(thisObject, what, from)) { if (PRIVATE.isVisible(thisObject, what, from)) {
DeclarationDescriptor classDescriptor = DescriptorUtils.getParentOfType(what, ClassDescriptor.class); DeclarationDescriptor classDescriptor = DescriptorUtils.getParentOfType(what, ClassDescriptor.class);
if (classDescriptor != null && thisObject instanceof ExpressionOrImplicitClassReceiver) { if (classDescriptor != null && thisObject instanceof ThisClassReceiver) {
return ((ExpressionOrImplicitClassReceiver) thisObject).getClassDescriptor().getOriginal().equals(classDescriptor.getOriginal()); return ((ThisClassReceiver) thisObject).getClassDescriptor().getOriginal().equals(classDescriptor.getOriginal());
} }
} }
return false; return false;
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ClassReceiver.kt
+5 -2
View File
@@ -18,11 +18,14 @@ package org.jetbrains.kotlin.resolve.scopes.receivers
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
interface ExpressionOrImplicitClassReceiver : ReceiverValue { /**
* Describes any "this" receiver inside a class
*/
interface ThisClassReceiver : ReceiverValue {
val classDescriptor: ClassDescriptor val classDescriptor: ClassDescriptor
} }
open class ClassReceiver(override val classDescriptor: ClassDescriptor) : ExpressionOrImplicitClassReceiver, ImplicitReceiver { open class ClassReceiver(override val classDescriptor: ClassDescriptor) : ThisClassReceiver, ImplicitReceiver {
override fun exists() = true override fun exists() = true