From c85be680478d8b55ac52ee90e4b33aed0b950fe0 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Wed, 4 Jan 2012 02:39:50 +0400 Subject: [PATCH] move typeinfo annotations annotations should not be used by developers, so place them under jet.runtime package --- .../src/org/jetbrains/jet/codegen/FunctionCodegen.java | 2 +- .../src/org/jetbrains/jet/codegen/JetTypeMapper.java | 3 --- .../jet/lang/resolve/java/JvmStdlibNames.java | 10 +++++----- stdlib/src/jet/{ => runtime}/typeinfo/JetClass.java | 2 +- stdlib/src/jet/{ => runtime}/typeinfo/JetMethod.java | 2 +- stdlib/src/jet/{ => runtime}/typeinfo/JetProperty.java | 2 +- .../jet/{ => runtime}/typeinfo/JetTypeDescriptor.java | 4 +++- .../jet/{ => runtime}/typeinfo/JetTypeParameter.java | 2 +- .../jet/{ => runtime}/typeinfo/JetTypeProjection.java | 6 ++++-- .../jet/{ => runtime}/typeinfo/JetValueParameter.java | 2 +- stdlib/src/org/jetbrains/jet/rt/TypeInfoParser.java | 2 +- 11 files changed, 19 insertions(+), 18 deletions(-) rename stdlib/src/jet/{ => runtime}/typeinfo/JetClass.java (91%) rename stdlib/src/jet/{ => runtime}/typeinfo/JetMethod.java (96%) rename stdlib/src/jet/{ => runtime}/typeinfo/JetProperty.java (90%) rename stdlib/src/jet/{ => runtime}/typeinfo/JetTypeDescriptor.java (87%) rename stdlib/src/jet/{ => runtime}/typeinfo/JetTypeParameter.java (94%) rename stdlib/src/jet/{ => runtime}/typeinfo/JetTypeProjection.java (81%) rename stdlib/src/jet/{ => runtime}/typeinfo/JetValueParameter.java (97%) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index 97345407289..685eb5292e9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -91,7 +91,7 @@ public class FunctionCodegen { if(v.generateCode()) { int start = 0; if(kind != OwnerKind.TRAIT_IMPL) { - AnnotationVisitor av = mv.visitAnnotation(JetTypeMapper.JET_METHOD_TYPE.getDescriptor(), true); + AnnotationVisitor av = mv.visitAnnotation(JvmStdlibNames.JET_METHOD.getDescriptor(), true); if(functionDescriptor.getReturnType().isNullable()) { av.visit(JvmStdlibNames.JET_METHOD_NULLABLE_RETURN_TYPE_FIELD, true); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java index a43b8af9573..da511707882 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java @@ -57,9 +57,6 @@ public class JetTypeMapper { public static final Type ARRAY_DOUBLE_TYPE = Type.getType(double[].class); public static final Type ARRAY_BOOL_TYPE = Type.getType(boolean[].class); public static final Type ARRAY_GENERIC_TYPE = Type.getType(Object[].class); - public static final Type JET_PARAMETER_TYPE = Type.getObjectType("jet/typeinfo/JetValueParameter"); - public static final Type JET_TYPE_PARAMETER_TYPE = Type.getObjectType("jet/typeinfo/JetTypeParameter"); - public static final Type JET_METHOD_TYPE = Type.getObjectType("jet/typeinfo/JetMethod"); private final JetStandardLibrary standardLibrary; private final BindingContext bindingContext; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java index 355db7e1e68..8d5a561e22c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java @@ -7,7 +7,7 @@ import org.objectweb.asm.Type; */ public class JvmStdlibNames { - public static final JvmClassName JET_VALUE_PARAMETER = new JvmClassName("jet.typeinfo.JetValueParameter"); + public static final JvmClassName JET_VALUE_PARAMETER = new JvmClassName("jet.runtime.typeinfo.JetValueParameter"); public static final String JET_VALUE_PARAMETER_NAME_FIELD = "name"; public static final String JET_VALUE_PARAMETER_HAS_DEFAULT_VALUE_FIELD = "hasDefaultValue"; @@ -16,21 +16,21 @@ public class JvmStdlibNames { public static final String JET_VALUE_PARAMETER_RECEIVER_FIELD = "receiver"; - public static final JvmClassName JET_TYPE_PARAMETER = new JvmClassName("jet.typeinfo.JetTypeParameter"); + public static final JvmClassName JET_TYPE_PARAMETER = new JvmClassName("jet.runtime.typeinfo.JetTypeParameter"); public static final String JET_TYPE_PARAMETER_NAME_FIELD = "name"; - public static final JvmClassName JET_METHOD = new JvmClassName("jet.typeinfo.JetMethod"); + public static final JvmClassName JET_METHOD = new JvmClassName("jet.runtime.typeinfo.JetMethod"); public static final String JET_METHOD_NULLABLE_RETURN_TYPE_FIELD = "nullableReturnType"; public static final String JET_METHOD_RETURN_TYPE_FIELD = "returnType"; public static final String JET_METHOD_TYPE_PARAMETERS_FIELD = "typeParameters"; - public static final JvmClassName JET_PROPERTY = new JvmClassName("jet.typeinfo.JetProperty"); + public static final JvmClassName JET_PROPERTY = new JvmClassName("jet.runtime.typeinfo.JetProperty"); - public static final JvmClassName JET_CLASS = new JvmClassName("jet.typeinfo.JetClass"); + public static final JvmClassName JET_CLASS = new JvmClassName("jet.runtime.typeinfo.JetClass"); public static final String JET_CLASS_SIGNATURE = "signature"; diff --git a/stdlib/src/jet/typeinfo/JetClass.java b/stdlib/src/jet/runtime/typeinfo/JetClass.java similarity index 91% rename from stdlib/src/jet/typeinfo/JetClass.java rename to stdlib/src/jet/runtime/typeinfo/JetClass.java index 7a887134347..b04979cbb1c 100644 --- a/stdlib/src/jet/typeinfo/JetClass.java +++ b/stdlib/src/jet/runtime/typeinfo/JetClass.java @@ -1,4 +1,4 @@ -package jet.typeinfo; +package jet.runtime.typeinfo; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/stdlib/src/jet/typeinfo/JetMethod.java b/stdlib/src/jet/runtime/typeinfo/JetMethod.java similarity index 96% rename from stdlib/src/jet/typeinfo/JetMethod.java rename to stdlib/src/jet/runtime/typeinfo/JetMethod.java index 8bca6f9db5a..47d4c9bf07a 100644 --- a/stdlib/src/jet/typeinfo/JetMethod.java +++ b/stdlib/src/jet/runtime/typeinfo/JetMethod.java @@ -1,4 +1,4 @@ -package jet.typeinfo; +package jet.runtime.typeinfo; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/stdlib/src/jet/typeinfo/JetProperty.java b/stdlib/src/jet/runtime/typeinfo/JetProperty.java similarity index 90% rename from stdlib/src/jet/typeinfo/JetProperty.java rename to stdlib/src/jet/runtime/typeinfo/JetProperty.java index 15f1f18084c..dbc996bf127 100644 --- a/stdlib/src/jet/typeinfo/JetProperty.java +++ b/stdlib/src/jet/runtime/typeinfo/JetProperty.java @@ -1,4 +1,4 @@ -package jet.typeinfo; +package jet.runtime.typeinfo; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/stdlib/src/jet/typeinfo/JetTypeDescriptor.java b/stdlib/src/jet/runtime/typeinfo/JetTypeDescriptor.java similarity index 87% rename from stdlib/src/jet/typeinfo/JetTypeDescriptor.java rename to stdlib/src/jet/runtime/typeinfo/JetTypeDescriptor.java index 3e2b558ff8f..8b82e4cc928 100644 --- a/stdlib/src/jet/typeinfo/JetTypeDescriptor.java +++ b/stdlib/src/jet/runtime/typeinfo/JetTypeDescriptor.java @@ -1,4 +1,6 @@ -package jet.typeinfo; +package jet.runtime.typeinfo; + +import jet.typeinfo.TypeInfoVariance; /** * @author alex.tkachman diff --git a/stdlib/src/jet/typeinfo/JetTypeParameter.java b/stdlib/src/jet/runtime/typeinfo/JetTypeParameter.java similarity index 94% rename from stdlib/src/jet/typeinfo/JetTypeParameter.java rename to stdlib/src/jet/runtime/typeinfo/JetTypeParameter.java index 2a748ce97bd..3e559789bc5 100644 --- a/stdlib/src/jet/typeinfo/JetTypeParameter.java +++ b/stdlib/src/jet/runtime/typeinfo/JetTypeParameter.java @@ -1,4 +1,4 @@ -package jet.typeinfo; +package jet.runtime.typeinfo; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/stdlib/src/jet/typeinfo/JetTypeProjection.java b/stdlib/src/jet/runtime/typeinfo/JetTypeProjection.java similarity index 81% rename from stdlib/src/jet/typeinfo/JetTypeProjection.java rename to stdlib/src/jet/runtime/typeinfo/JetTypeProjection.java index fbd90bf7739..0358bcb9532 100644 --- a/stdlib/src/jet/typeinfo/JetTypeProjection.java +++ b/stdlib/src/jet/runtime/typeinfo/JetTypeProjection.java @@ -1,4 +1,6 @@ -package jet.typeinfo; +package jet.runtime.typeinfo; + +import jet.typeinfo.TypeInfoVariance; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -13,7 +15,7 @@ public @interface JetTypeProjection { /** * @return variance of the type */ - TypeInfoVariance variance(); + TypeInfoVariance variance(); /** * @return index of the class in the per class table of JetTypeDescriptor diff --git a/stdlib/src/jet/typeinfo/JetValueParameter.java b/stdlib/src/jet/runtime/typeinfo/JetValueParameter.java similarity index 97% rename from stdlib/src/jet/typeinfo/JetValueParameter.java rename to stdlib/src/jet/runtime/typeinfo/JetValueParameter.java index cc3b7aebbf0..91c1a2e7e2e 100644 --- a/stdlib/src/jet/typeinfo/JetValueParameter.java +++ b/stdlib/src/jet/runtime/typeinfo/JetValueParameter.java @@ -1,4 +1,4 @@ -package jet.typeinfo; +package jet.runtime.typeinfo; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/stdlib/src/org/jetbrains/jet/rt/TypeInfoParser.java b/stdlib/src/org/jetbrains/jet/rt/TypeInfoParser.java index c2aa3476242..72003cd7b1e 100644 --- a/stdlib/src/org/jetbrains/jet/rt/TypeInfoParser.java +++ b/stdlib/src/org/jetbrains/jet/rt/TypeInfoParser.java @@ -1,7 +1,7 @@ package org.jetbrains.jet.rt; import jet.TypeInfo; -import jet.typeinfo.JetClass; +import jet.runtime.typeinfo.JetClass; import jet.typeinfo.TypeInfoProjection; import jet.typeinfo.TypeInfoVariance; import org.jetbrains.jet.rt.signature.JetSignatureExceptionsAdapter;