azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted some usages of JvmClassName(Class) constructor. They introduce conceptual problems, but not much profit.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-04 17:27:32 +04:00
parent af9ed4082b
commit 9c8da5ad9c
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
+1 -3
View File
@@ -16,8 +16,6 @@
package org.jetbrains.jet.lang.resolve.java;
import org.jetbrains.annotations.NotNull;
/**
* @author Stepan Koltsov
*/
@@ -30,5 +28,5 @@ public class JvmAbi {
public static final String CLASS_OBJECT_SUFFIX = "$ClassObject$";
public static final String CLASS_OBJECT_CLASS_NAME = "ClassObject$";
public static final JvmClassName JETBRAINS_NOT_NULL_ANNOTATION = new JvmClassName(NotNull.class);
public static final JvmClassName JETBRAINS_NOT_NULL_ANNOTATION = new JvmClassName("org.jetbrains.annotations.NotNull");
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java
+10 -11
View File
@@ -16,16 +16,15 @@
package org.jetbrains.jet.lang.resolve.java;
import jet.JetObject;
import jet.runtime.typeinfo.*;
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
import jet.runtime.typeinfo.JetConstructor;
import jet.runtime.typeinfo.KotlinSignature;
/**
* @author Stepan Koltsov
*/
public class JvmStdlibNames {
public static final JvmClassName JET_VALUE_PARAMETER = new JvmClassName(JetValueParameter.class);
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";
@@ -34,12 +33,12 @@ public class JvmStdlibNames {
public static final String JET_VALUE_PARAMETER_RECEIVER_FIELD = "receiver";
public static final JvmClassName JET_TYPE_PARAMETER = new JvmClassName(JetTypeParameter.class);
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(JetMethod.class);
public static final JvmClassName JET_METHOD = new JvmClassName("jet.runtime.typeinfo.JetMethod");
public static final String JET_METHOD_KIND_FIELD = "kind";
public static final String JET_METHOD_NULLABLE_RETURN_TYPE_FIELD = "nullableReturnType";
@@ -51,7 +50,7 @@ public class JvmStdlibNames {
public static final int JET_METHOD_KIND_PROPERTY = 1;
public static final int JET_METHOD_KIND_DEFAULT = JET_METHOD_KIND_REGULAR;
public static final JvmClassName JET_CONSTRUCTOR = new JvmClassName(JetConstructor.class);
public static final JvmClassName JET_CONSTRUCTOR = new JvmClassName("jet.runtime.typeinfo.JetConstructor");
/**
* @deprecated
@@ -60,17 +59,17 @@ public class JvmStdlibNames {
public static final String JET_CONSTRUCTOR_HIDDEN_FIELD = "hidden";
public static final JvmClassName JET_CLASS = new JvmClassName(JetClass.class);
public static final JvmClassName JET_CLASS = new JvmClassName("jet.runtime.typeinfo.JetClass");
public static final String JET_CLASS_SIGNATURE = "signature";
public static final JvmClassName JET_OBJECT = new JvmClassName(JetObject.class);
public static final JvmClassName JET_OBJECT = new JvmClassName("jet.JetObject");
public static final JvmClassName ASSERT_INVISIBLE_IN_RESOLVER = new JvmClassName(AssertInvisibleInResolver.class);
public static final JvmClassName ASSERT_INVISIBLE_IN_RESOLVER = new JvmClassName("org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver");
public static final JvmClassName KOTLIN_SIGNATURE = new JvmClassName(KotlinSignature.class);
public static final JvmClassName KOTLIN_SIGNATURE = new JvmClassName(KotlinSignature.class.getName());
public static final String KOTLIN_SIGNATURE_VALUE_METHOD = "value";
private JvmStdlibNames() {