From 6acce0f9303fa77b2419cbe0f8128cdda9b73704 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 10 Feb 2014 20:04:57 +0400 Subject: [PATCH] Move jet.runtime.Intrinsic to kotlin.jvm.internal.Intrinsic --- .../resolve/CompileTimeConstantUtils.java | 4 +-- .../src/jet/runtime/Intrinsic.java | 28 ------------------- libraries/stdlib/src/kotlin/ArraysJVM.kt | 2 +- libraries/stdlib/src/kotlin/JLangJVM.kt | 5 +--- .../src/kotlin/jvm/internal/Intrinsic.kt | 6 ++++ 5 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 core/runtime.jvm/src/jet/runtime/Intrinsic.java create mode 100644 libraries/stdlib/src/kotlin/jvm/internal/Intrinsic.kt diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java index f61dcf82013..920e89bf11b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.lang.resolve; -import jet.runtime.Intrinsic; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; @@ -97,7 +96,8 @@ public class CompileTimeConstantUtils { @Nullable public static String getIntrinsicAnnotationArgument(@NotNull Annotated annotatedDescriptor) { - AnnotationDescriptor intrinsicAnnotation = annotatedDescriptor.getAnnotations().findAnnotation(new FqName(Intrinsic.class.getName())); + AnnotationDescriptor intrinsicAnnotation = + annotatedDescriptor.getAnnotations().findAnnotation(new FqName("kotlin.jvm.internal.Intrinsic")); if (intrinsicAnnotation == null) return null; Collection> values = intrinsicAnnotation.getAllValueArguments().values(); diff --git a/core/runtime.jvm/src/jet/runtime/Intrinsic.java b/core/runtime.jvm/src/jet/runtime/Intrinsic.java deleted file mode 100644 index adf74aef4a5..00000000000 --- a/core/runtime.jvm/src/jet/runtime/Intrinsic.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2013 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 jet.runtime; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface Intrinsic { - String value(); -} diff --git a/libraries/stdlib/src/kotlin/ArraysJVM.kt b/libraries/stdlib/src/kotlin/ArraysJVM.kt index 9534db8647c..44acc2573b9 100644 --- a/libraries/stdlib/src/kotlin/ArraysJVM.kt +++ b/libraries/stdlib/src/kotlin/ArraysJVM.kt @@ -3,7 +3,7 @@ package kotlin import java.io.ByteArrayInputStream import java.nio.charset.Charset import java.util.Arrays -import jet.runtime.Intrinsic +import kotlin.jvm.internal.Intrinsic // Array "constructor" [Intrinsic("kotlin.arrays.array")] public fun array(vararg t : T) : Array = t diff --git a/libraries/stdlib/src/kotlin/JLangJVM.kt b/libraries/stdlib/src/kotlin/JLangJVM.kt index fafe9799cfa..0ffde80a097 100644 --- a/libraries/stdlib/src/kotlin/JLangJVM.kt +++ b/libraries/stdlib/src/kotlin/JLangJVM.kt @@ -1,10 +1,7 @@ package kotlin -import java.lang.Class -import java.lang.Object import java.lang.annotation.* - -import jet.runtime.Intrinsic +import kotlin.jvm.internal.Intrinsic /** * This annotation indicates what exceptions should be declared by a function when compiled to a JVM method diff --git a/libraries/stdlib/src/kotlin/jvm/internal/Intrinsic.kt b/libraries/stdlib/src/kotlin/jvm/internal/Intrinsic.kt new file mode 100644 index 00000000000..05fc4ad46c8 --- /dev/null +++ b/libraries/stdlib/src/kotlin/jvm/internal/Intrinsic.kt @@ -0,0 +1,6 @@ +package kotlin.jvm.internal + +import java.lang.annotation.* + +Retention(RetentionPolicy.RUNTIME) +annotation class Intrinsic(val value: String)