Package rename: asm->inline

This commit is contained in:
Mikhael Bogdanov
2014-02-21 11:32:43 +04:00
parent 3bf952b49c
commit 476a9ede64
26 changed files with 32 additions and 33 deletions
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.codegen.asm;
package org.jetbrains.jet.codegen.inline;
public class FieldAccess {
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;