提交 c85be680 编写于 作者: S Stepan Koltsov

move typeinfo annotations

annotations should not be used by developers, so place them under jet.runtime package
上级 e373d215
......@@ -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);
}
......
......@@ -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;
......
......@@ -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";
......
package jet.typeinfo;
package jet.runtime.typeinfo;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
......
package jet.typeinfo;
package jet.runtime.typeinfo;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
......
package jet.typeinfo;
package jet.runtime.typeinfo;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
......
package jet.typeinfo;
package jet.runtime.typeinfo;
import jet.typeinfo.TypeInfoVariance;
/**
* @author alex.tkachman
......
package jet.typeinfo;
package jet.runtime.typeinfo;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
......
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
......
package jet.typeinfo;
package jet.runtime.typeinfo;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
......
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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册