From 22ef81b0f8b0341fb0a2c7dca554a68e3a691e1c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 10 Feb 2014 22:23:18 +0400 Subject: [PATCH] Move CollectionToArray from package "jet" to "kotlin" --- .../org/jetbrains/jet/codegen/ImplementationBodyCodegen.java | 4 ++-- .../runtime => kotlin/jvm/internal}/CollectionToArray.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename core/runtime.jvm/src/{jet/runtime => kotlin/jvm/internal}/CollectionToArray.java (98%) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index c0a53ab8301..fac6074fc59 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -502,7 +502,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { mv.visitCode(); iv.load(0, classAsmType); - iv.invokestatic("jet/runtime/CollectionToArray", "toArray", "(Ljava/util/Collection;)[Ljava/lang/Object;"); + iv.invokestatic("kotlin/jvm/internal/CollectionToArray", "toArray", "(Ljava/util/Collection;)[Ljava/lang/Object;"); iv.areturn(Type.getObjectType("[Ljava/lang/Object;")); FunctionCodegen.endVisit(mv, "toArray", myClass); @@ -519,7 +519,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { iv.load(0, classAsmType); iv.load(1, Type.getObjectType("[Ljava/lang/Object;")); - iv.invokestatic("jet/runtime/CollectionToArray", "toArray", "(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;"); + iv.invokestatic("kotlin/jvm/internal/CollectionToArray", "toArray", "(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;"); iv.areturn(Type.getObjectType("[Ljava/lang/Object;")); FunctionCodegen.endVisit(mv, "toArray", myClass); diff --git a/core/runtime.jvm/src/jet/runtime/CollectionToArray.java b/core/runtime.jvm/src/kotlin/jvm/internal/CollectionToArray.java similarity index 98% rename from core/runtime.jvm/src/jet/runtime/CollectionToArray.java rename to core/runtime.jvm/src/kotlin/jvm/internal/CollectionToArray.java index 2b5434f58b5..ca818a80ea9 100644 --- a/core/runtime.jvm/src/jet/runtime/CollectionToArray.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/CollectionToArray.java @@ -1,4 +1,4 @@ -package jet.runtime; +package kotlin.jvm.internal; import java.util.Arrays; import java.util.Collection;