Pseudocode: Merge all access instructions into single file

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/AccessValueInstruction.kt

@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval
-
-import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
-import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
-import org.jetbrains.jet.lang.descriptors.VariableDescriptor
-import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
-import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind
-import java.util.Collections
-
-public trait AccessTarget {
-    public data class Declaration(val descriptor: VariableDescriptor): AccessTarget
-    public data class Call(val resolvedCall: ResolvedCall<*>): AccessTarget
-    public object BlackBox: AccessTarget
-}
-
-public abstract class AccessValueInstruction protected (
-        element: JetElement,
-        lexicalScope: LexicalScope,
-        public val target: AccessTarget,
-        public override val receiverValues: Map<PseudoValue, ReceiverValue>
-) : InstructionWithNext(element, lexicalScope), InstructionWithReceivers

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/WriteValueInstruction.kt

@@ -1,55 +0,0 @@
-/*
- * Copyright 2010-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval
-
-import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.psi.JetNamedDeclaration
-import java.util.Collections
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
-import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
-
-public class WriteValueInstruction(
-        assignment: JetElement,
-        lexicalScope: LexicalScope,
-        target: AccessTarget,
-        receiverValues: Map<PseudoValue, ReceiverValue>,
-        public val lValue: JetElement,
-        public val rValue: PseudoValue
-) : AccessValueInstruction(assignment, lexicalScope, target, receiverValues) {
-    override val inputValues: List<PseudoValue>
-        get() = receiverValues.keySet() + rValue
-
-    override fun accept(visitor: InstructionVisitor) {
-        visitor.visitWriteValue(this)
-    }
-
-    override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R {
-        return visitor.visitWriteValue(this)
-    }
-
-    override fun toString(): String {
-        val lhs = (lValue as? JetNamedDeclaration)?.getName() ?: render(lValue)
-        return "w($lhs|${inputValues.makeString(", ")})"
-    }
-
-    override fun createCopy(): InstructionImpl =
-            WriteValueInstruction(element, lexicalScope, target, receiverValues, lValue, rValue)
-}

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/accessInstructions.kt

@@ -17,13 +17,30 @@
 package org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval
 
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValueFactory
 import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
+import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
+import org.jetbrains.jet.lang.descriptors.VariableDescriptor
+import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
+import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValueFactory
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
-import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
+import org.jetbrains.jet.lang.psi.JetNamedDeclaration
+
+public trait AccessTarget {
+    public data class Declaration(val descriptor: VariableDescriptor): AccessTarget
+    public data class Call(val resolvedCall: ResolvedCall<*>): AccessTarget
+    public object BlackBox: AccessTarget
+}
+
+public abstract class AccessValueInstruction protected (
+        element: JetElement,
+        lexicalScope: LexicalScope,
+        public val target: AccessTarget,
+        public override val receiverValues: Map<PseudoValue, ReceiverValue>
+) : InstructionWithNext(element, lexicalScope), InstructionWithReceivers
 
 public class ReadValueInstruction private (
         element: JetElement,
@@ -74,3 +91,31 @@ public class ReadValueInstruction private (
         }
     }
 }
+
+public class WriteValueInstruction(
+        assignment: JetElement,
+        lexicalScope: LexicalScope,
+        target: AccessTarget,
+        receiverValues: Map<PseudoValue, ReceiverValue>,
+        public val lValue: JetElement,
+        public val rValue: PseudoValue
+) : AccessValueInstruction(assignment, lexicalScope, target, receiverValues) {
+    override val inputValues: List<PseudoValue>
+        get() = receiverValues.keySet() + rValue
+
+    override fun accept(visitor: InstructionVisitor) {
+        visitor.visitWriteValue(this)
+    }
+
+    override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R {
+        return visitor.visitWriteValue(this)
+    }
+
+    override fun toString(): String {
+        val lhs = (lValue as? JetNamedDeclaration)?.getName() ?: render(lValue)
+        return "w($lhs|${inputValues.makeString(", ")})"
+    }
+
+    override fun createCopy(): InstructionImpl =
+            WriteValueInstruction(element, lexicalScope, target, receiverValues, lValue, rValue)
+}