From 476a9ede6458e4930d65926a00d777eceabe270a Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Fri, 21 Feb 2014 11:32:43 +0400 Subject: [PATCH] Package rename: asm->inline --- .../src/org/jetbrains/jet/codegen/ClosureCodegen.java | 2 +- .../src/org/jetbrains/jet/codegen/ExpressionCodegen.java | 6 +++--- .../src/org/jetbrains/jet/codegen/MemberCodegen.java | 4 ++-- .../jet/codegen/{asm => inline}/CapturedParamInfo.java | 2 +- .../jet/codegen/{asm => inline}/ConstructorInvocation.java | 2 +- .../jetbrains/jet/codegen/{asm => inline}/FieldAccess.java | 2 +- .../jet/codegen/{asm => inline}/InlinableAccess.java | 2 +- .../jet/codegen/{asm => inline}/InlineAdapter.java | 2 +- .../jet/codegen/{asm => inline}/InlineCodegen.java | 2 +- .../jet/codegen/{asm => inline}/InlineCodegenUtil.java | 2 +- .../jet/codegen/{asm => inline}/InlineFieldRemapper.java | 4 ++-- .../org/jetbrains/jet/codegen/{asm => inline}/Inliner.java | 2 +- .../jetbrains/jet/codegen/{asm => inline}/InliningInfo.java | 2 +- .../jet/codegen/{asm => inline}/LambdaFieldRemapper.java | 4 ++-- .../jetbrains/jet/codegen/{asm => inline}/LambdaInfo.java | 2 +- .../jet/codegen/{asm => inline}/LambdaTransformer.java | 2 +- .../jetbrains/jet/codegen/{asm => inline}/MaxCalcNode.java | 2 +- .../jet/codegen/{asm => inline}/MethodInliner.java | 5 ++--- .../jet/codegen/{asm => inline}/NameGenerator.java | 2 +- .../jet/codegen/{asm => inline}/ParameterInfo.java | 2 +- .../jetbrains/jet/codegen/{asm => inline}/Parameters.java | 2 +- .../jet/codegen/{asm => inline}/ParametersBuilder.java | 2 +- .../jetbrains/jet/codegen/{asm => inline}/RemapVisitor.java | 2 +- .../jetbrains/jet/codegen/{asm => inline}/ShiftAdapter.java | 2 +- .../jetbrains/jet/codegen/{asm => inline}/TypeRemapper.java | 2 +- .../jetbrains/jet/codegen/{asm => inline}/VarRemapper.java | 2 +- 26 files changed, 32 insertions(+), 33 deletions(-) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/CapturedParamInfo.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/ConstructorInvocation.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/FieldAccess.java (96%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/InlinableAccess.java (96%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/InlineAdapter.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/InlineCodegen.java (99%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/InlineCodegenUtil.java (99%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/InlineFieldRemapper.java (97%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/Inliner.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/InliningInfo.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/LambdaFieldRemapper.java (95%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/LambdaInfo.java (99%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/LambdaTransformer.java (99%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/MaxCalcNode.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/MethodInliner.java (99%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/NameGenerator.java (97%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/ParameterInfo.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/Parameters.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/ParametersBuilder.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/RemapVisitor.java (98%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/ShiftAdapter.java (96%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/TypeRemapper.java (97%) rename compiler/backend/src/org/jetbrains/jet/codegen/{asm => inline}/VarRemapper.java (99%) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java index 2cb4bd02199..cc793e9939f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java @@ -25,7 +25,7 @@ import org.jetbrains.asm4.MethodVisitor; import org.jetbrains.asm4.Type; import org.jetbrains.asm4.commons.InstructionAdapter; import org.jetbrains.asm4.commons.Method; -import org.jetbrains.jet.codegen.asm.Inliner; +import org.jetbrains.jet.codegen.inline.Inliner; import org.jetbrains.jet.codegen.binding.CalculatedClosure; import org.jetbrains.jet.codegen.context.CodegenContext; import org.jetbrains.jet.codegen.context.LocalLookup; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index e1e905c6324..c79c9edd7e9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -32,9 +32,9 @@ import org.jetbrains.asm4.MethodVisitor; import org.jetbrains.asm4.Type; import org.jetbrains.asm4.commons.InstructionAdapter; import org.jetbrains.asm4.commons.Method; -import org.jetbrains.jet.codegen.asm.InlineCodegen; -import org.jetbrains.jet.codegen.asm.Inliner; -import org.jetbrains.jet.codegen.asm.NameGenerator; +import org.jetbrains.jet.codegen.inline.InlineCodegen; +import org.jetbrains.jet.codegen.inline.Inliner; +import org.jetbrains.jet.codegen.inline.NameGenerator; import org.jetbrains.jet.codegen.binding.CalculatedClosure; import org.jetbrains.jet.codegen.binding.CodegenBinding; import org.jetbrains.jet.codegen.binding.MutableClosure; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java index 4902e2c481f..4c92a642621 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.codegen; import com.intellij.openapi.progress.ProcessCanceledException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.codegen.asm.InlineCodegenUtil; -import org.jetbrains.jet.codegen.asm.NameGenerator; +import org.jetbrains.jet.codegen.inline.InlineCodegenUtil; +import org.jetbrains.jet.codegen.inline.NameGenerator; import org.jetbrains.jet.codegen.context.ClassContext; import org.jetbrains.jet.codegen.context.CodegenContext; import org.jetbrains.jet.codegen.context.FieldOwnerContext; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/CapturedParamInfo.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamInfo.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/CapturedParamInfo.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamInfo.java index 3daccd72a7a..14c1717e10c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/CapturedParamInfo.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.asm4.Type; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/ConstructorInvocation.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ConstructorInvocation.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/ConstructorInvocation.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/ConstructorInvocation.java index 77df498f54b..52d688386a0 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/ConstructorInvocation.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ConstructorInvocation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.asm4.Type; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/FieldAccess.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldAccess.java similarity index 96% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/FieldAccess.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldAccess.java index 2a83e92a6fd..60f94e56981 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/FieldAccess.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldAccess.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; public class FieldAccess { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlinableAccess.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinableAccess.java similarity index 96% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/InlinableAccess.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinableAccess.java index dd0bf8262bf..0d4a4b7cba7 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlinableAccess.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinableAccess.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.Nullable; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineAdapter.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineAdapter.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineAdapter.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineAdapter.java index fefe4828bdf..34afff36a9d 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineAdapter.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.asm4.Label; import org.jetbrains.asm4.MethodVisitor; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java similarity index 99% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineCodegen.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java index 872ea926731..f45536f52cd 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java similarity index 99% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineCodegenUtil.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java index 124b386e04b..991704596e5 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineFieldRemapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineFieldRemapper.java similarity index 97% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineFieldRemapper.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineFieldRemapper.java index 44f1b7e894d..61dd56eef60 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineFieldRemapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineFieldRemapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.Nullable; import org.jetbrains.asm4.Opcodes; @@ -27,7 +27,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.codegen.asm.MethodInliner.getPreviousNoLabelNoLine; +import static org.jetbrains.jet.codegen.inline.MethodInliner.getPreviousNoLabelNoLine; public class InlineFieldRemapper extends LambdaFieldRemapper { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/Inliner.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/Inliner.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/Inliner.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/Inliner.java index b6d057f1515..64b60c3c215 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/Inliner.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/Inliner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.asm4.ClassVisitor; import org.jetbrains.asm4.Type; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InliningInfo.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningInfo.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/InliningInfo.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningInfo.java index 5366bbbe38e..b633e901e4d 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/InliningInfo.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.jet.codegen.context.CodegenContext; import org.jetbrains.jet.codegen.state.GenerationState; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/LambdaFieldRemapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaFieldRemapper.java similarity index 95% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/LambdaFieldRemapper.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaFieldRemapper.java index 9b43d453e83..c0d326d07ec 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/LambdaFieldRemapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaFieldRemapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.Nullable; import org.jetbrains.asm4.Opcodes; @@ -26,7 +26,7 @@ import org.jetbrains.asm4.tree.VarInsnNode; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.codegen.asm.MethodInliner.getPreviousNoLabelNoLine; +import static org.jetbrains.jet.codegen.inline.MethodInliner.getPreviousNoLabelNoLine; public class LambdaFieldRemapper { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/LambdaInfo.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java similarity index 99% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/LambdaInfo.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java index 49a59d5d32e..82200514013 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/LambdaInfo.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.asm4.Type; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/LambdaTransformer.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaTransformer.java similarity index 99% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/LambdaTransformer.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaTransformer.java index 668f5cd1bd3..1c9d47e1b5f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/LambdaTransformer.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaTransformer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import com.intellij.openapi.util.Pair; import com.intellij.openapi.vfs.VirtualFile; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/MaxCalcNode.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MaxCalcNode.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/MaxCalcNode.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/MaxCalcNode.java index 7efd00d44e7..7785d8672e8 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/MaxCalcNode.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MaxCalcNode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.asm4.MethodVisitor; import org.jetbrains.asm4.Opcodes; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/MethodInliner.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java similarity index 99% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/MethodInliner.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java index f1aac6fe74f..e2bda2a3287 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/MethodInliner.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import com.google.common.collect.Lists; import com.intellij.util.ArrayUtil; @@ -10,7 +10,6 @@ import org.jetbrains.asm4.Opcodes; import org.jetbrains.asm4.Type; import org.jetbrains.asm4.commons.InstructionAdapter; import org.jetbrains.asm4.commons.Method; -import org.jetbrains.asm4.commons.Remapper; import org.jetbrains.asm4.commons.RemappingMethodAdapter; import org.jetbrains.asm4.tree.*; import org.jetbrains.asm4.tree.analysis.*; @@ -22,7 +21,7 @@ import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; import java.util.*; -import static org.jetbrains.jet.codegen.asm.InlineCodegenUtil.*; +import static org.jetbrains.jet.codegen.inline.InlineCodegenUtil.*; public class MethodInliner { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/NameGenerator.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/NameGenerator.java similarity index 97% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/NameGenerator.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/NameGenerator.java index c640a9ad8e2..13e4c337f6b 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/NameGenerator.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/NameGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import java.util.HashMap; import java.util.Map; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/ParameterInfo.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/ParameterInfo.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java index 6a35d0cd5bb..46ed74328d1 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/ParameterInfo.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/Parameters.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/Parameters.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/Parameters.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/Parameters.java index 6299d02121d..d835b088057 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/Parameters.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/Parameters.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import com.google.common.collect.Iterables; import org.jetbrains.annotations.NotNull; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/ParametersBuilder.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParametersBuilder.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/ParametersBuilder.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/ParametersBuilder.java index 5b303692fd8..a577290a7f8 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/ParametersBuilder.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParametersBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.Nullable; import org.jetbrains.asm4.Type; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/RemapVisitor.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/RemapVisitor.java similarity index 98% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/RemapVisitor.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/RemapVisitor.java index bc8e191b6ac..7c2b5a47da9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/RemapVisitor.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/RemapVisitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.asm4.AnnotationVisitor; import org.jetbrains.asm4.Label; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/ShiftAdapter.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ShiftAdapter.java similarity index 96% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/ShiftAdapter.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/ShiftAdapter.java index 74ae2c9fa20..235e96ed5d9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/ShiftAdapter.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ShiftAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.asm4.MethodVisitor; import org.jetbrains.asm4.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/TypeRemapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/TypeRemapper.java similarity index 97% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/TypeRemapper.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/TypeRemapper.java index 601811df085..f6d62c393d0 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/TypeRemapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/TypeRemapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.asm4.commons.Remapper; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/asm/VarRemapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/VarRemapper.java similarity index 99% rename from compiler/backend/src/org/jetbrains/jet/codegen/asm/VarRemapper.java rename to compiler/backend/src/org/jetbrains/jet/codegen/inline/VarRemapper.java index f5f08d9a861..9c7af627b7a 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/asm/VarRemapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/VarRemapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.codegen.asm; +package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;