From fcdd5a872c4ae362cdbfade685542fae3dddb498 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 17 Mar 2015 16:06:14 +0300
Subject: [PATCH] Rename dispatchReceiver -> instance, T -> E

---
 core/builtins/src/kotlin/reflect/KExtensionProperty.kt    | 8 ++++----
 .../src/kotlin/reflect/KMemberExtensionProperty.kt        | 8 ++++----
 core/builtins/src/kotlin/reflect/KMemberProperty.kt       | 4 ++--
 .../src/kotlin/reflect/KTopLevelExtensionProperty.kt      | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/builtins/src/kotlin/reflect/KExtensionProperty.kt b/core/builtins/src/kotlin/reflect/KExtensionProperty.kt
index f5318ee928d..e0ad3f86d93 100644
--- a/core/builtins/src/kotlin/reflect/KExtensionProperty.kt
+++ b/core/builtins/src/kotlin/reflect/KExtensionProperty.kt
@@ -16,10 +16,10 @@
 
 package kotlin.reflect
 
-public trait KExtensionProperty<T, out R> : KProperty<R> {
-    public fun get(receiver: T): R
+public trait KExtensionProperty<E, out R> : KProperty<R> {
+    public fun get(receiver: E): R
 }
 
-public trait KMutableExtensionProperty<T, R> : KExtensionProperty<T, R>, KMutableProperty<R> {
-    public fun set(receiver: T, value: R)
+public trait KMutableExtensionProperty<E, R> : KExtensionProperty<E, R>, KMutableProperty<R> {
+    public fun set(receiver: E, value: R)
 }
diff --git a/core/builtins/src/kotlin/reflect/KMemberExtensionProperty.kt b/core/builtins/src/kotlin/reflect/KMemberExtensionProperty.kt
index c6862f7080d..de55777311f 100644
--- a/core/builtins/src/kotlin/reflect/KMemberExtensionProperty.kt
+++ b/core/builtins/src/kotlin/reflect/KMemberExtensionProperty.kt
@@ -16,10 +16,10 @@
 
 package kotlin.reflect
 
-public trait KMemberExtensionProperty<D : Any, E, out R> : KProperty<R> {
-    public fun get(dispatchReceiver: D, extensionReceiver: E): R
+public trait KMemberExtensionProperty<T : Any, E, out R> : KProperty<R> {
+    public fun get(instance: T, extensionReceiver: E): R
 }
 
-public trait KMutableMemberExtensionProperty<D : Any, E, R> : KMemberExtensionProperty<D, E, R>, KMutableProperty<R> {
-    public fun set(dispatchReceiver: D, extensionReceiver: E, value: R)
+public trait KMutableMemberExtensionProperty<T : Any, E, R> : KMemberExtensionProperty<T, E, R>, KMutableProperty<R> {
+    public fun set(instance: T, extensionReceiver: E, value: R)
 }
diff --git a/core/builtins/src/kotlin/reflect/KMemberProperty.kt b/core/builtins/src/kotlin/reflect/KMemberProperty.kt
index 358ce0abde9..4c5c8e7bc01 100644
--- a/core/builtins/src/kotlin/reflect/KMemberProperty.kt
+++ b/core/builtins/src/kotlin/reflect/KMemberProperty.kt
@@ -17,9 +17,9 @@
 package kotlin.reflect
 
 public trait KMemberProperty<T : Any, out R> : KProperty<R> {
-    public fun get(receiver: T): R
+    public fun get(instance: T): R
 }
 
 public trait KMutableMemberProperty<T : Any, R> : KMemberProperty<T, R>, KMutableProperty<R> {
-    public fun set(receiver: T, value: R)
+    public fun set(instance: T, value: R)
 }
diff --git a/core/builtins/src/kotlin/reflect/KTopLevelExtensionProperty.kt b/core/builtins/src/kotlin/reflect/KTopLevelExtensionProperty.kt
index dbd7bb8401f..9e8efa9c702 100644
--- a/core/builtins/src/kotlin/reflect/KTopLevelExtensionProperty.kt
+++ b/core/builtins/src/kotlin/reflect/KTopLevelExtensionProperty.kt
@@ -16,6 +16,6 @@
 
 package kotlin.reflect
 
-public trait KTopLevelExtensionProperty<T, out R> : KExtensionProperty<T, R>, KTopLevelProperty<R>
+public trait KTopLevelExtensionProperty<E, out R> : KExtensionProperty<E, R>, KTopLevelProperty<R>
 
-public trait KMutableTopLevelExtensionProperty<T, R> : KTopLevelExtensionProperty<T, R>, KMutableExtensionProperty<T, R>, KMutableTopLevelProperty<R>
+public trait KMutableTopLevelExtensionProperty<E, R> : KTopLevelExtensionProperty<E, R>, KMutableExtensionProperty<E, R>, KMutableTopLevelProperty<R>