From 86833c1a74829e8ec92fd8f30c1b291d472b059f Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 22 Sep 2015 10:15:52 +0300
Subject: [PATCH] Migration to new backing field syntax

---
 .../cfg/pseudocode/instructions/InstructionWithNext.kt    | 2 +-
 .../instructions/jumps/AbstractJumpInstruction.kt         | 2 +-
 .../special/LocalFunctionDeclarationInstruction.kt        | 2 +-
 .../src/org/jetbrains/kotlin/psi/JetCodeFragment.kt       | 2 +-
 libraries/stdlib/test/properties/PropertiesTest.kt        | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt
index e6cdb899289..5480d4cd95f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt
@@ -25,7 +25,7 @@ public abstract class InstructionWithNext(
 ) : JetElementInstructionImpl(element, lexicalScope) {
     public var next: Instruction? = null
         set(value: Instruction?) {
-            $next = outgoingEdgeTo(value)
+            field = outgoingEdgeTo(value)
         }
 
     override val nextInstructions: Collection<Instruction>
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt
index 9851fe9bc0e..f78d3371924 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt
@@ -31,7 +31,7 @@ public abstract class AbstractJumpInstruction(
 ) : JetElementInstructionImpl(element, lexicalScope), JumpInstruction {
     public var resolvedTarget: Instruction? = null
         set(value: Instruction?) {
-            $resolvedTarget = outgoingEdgeTo(value)
+            field = outgoingEdgeTo(value)
         }
 
     protected abstract fun createCopy(newLabel: Label, lexicalScope: LexicalScope): AbstractJumpInstruction
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt
index 9a16df1ffd5..08f600c545c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt
@@ -33,7 +33,7 @@ public class LocalFunctionDeclarationInstruction(
 ) : InstructionWithNext(element, lexicalScope) {
     public var sink: SubroutineSinkInstruction? = null
         set(value: SubroutineSinkInstruction?) {
-            $sink = outgoingEdgeTo(value) as SubroutineSinkInstruction?
+            field = outgoingEdgeTo(value) as SubroutineSinkInstruction?
         }
 
     override val nextInstructions: Collection<Instruction>
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt
index 563bd83cf40..ac5d32a456a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt
@@ -93,7 +93,7 @@ public abstract class JetCodeFragment(
     override fun getSuperType() = superType
 
     override fun setSuperType(superType: PsiType?) {
-        $superType = superType
+        this.superType = superType
     }
 
     override fun importsToString(): String {
diff --git a/libraries/stdlib/test/properties/PropertiesTest.kt b/libraries/stdlib/test/properties/PropertiesTest.kt
index 4b604fbd41b..03391a24706 100644
--- a/libraries/stdlib/test/properties/PropertiesTest.kt
+++ b/libraries/stdlib/test/properties/PropertiesTest.kt
@@ -11,14 +11,14 @@ class Customer : ChangeSupport() {
     // via KT-1299
     var name: String? = null
     set(value) {
-        changeProperty("name", $name, value)
-        $name = value
+        changeProperty("name", field, value)
+        field = value
     }
 
     var city: String? = null
     set(value) {
-        changeProperty("city", $city, value)
-        $city = value
+        changeProperty("city", field, value)
+        field = value
     }
 
     override fun toString() = "Customer($name, $city)"