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

Move jet.JetObject -> kotlin.jvm.internal.KObject

Browse Source 
Don't use JetObject as a marker class in KotlinRuntimeLibraryUtil anymore,
since there are other classes for this purpose (KotlinPackage, Unit)
This commit is contained in:
Alexander Udalov
2014-02-14 16:16:24 +04:00
parent d8066c8d56
commit 0da92e22a2
21 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/nullabilityAnnotations/Class.java
+2 -2
View File
@@ -1,4 +1,4 @@
public final class Class implements jet.JetObject {
public final class Class implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
private final java.lang.String nullableVal = "";
@org.jetbrains.annotations.Nullable
@@ -71,4 +71,4 @@ public final class Class implements jet.JetObject {
@org.jetbrains.annotations.NotNull
public Class() { /* compiled code */ }
}
}
compiler/testData/asJava/nullabilityAnnotations/ClassObjectField.java
+3 -3
View File
@@ -1,4 +1,4 @@
public final class ClassObjectField implements jet.JetObject {
public final class ClassObjectField implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
public static final java.lang.String x = "";
private static final java.lang.String y = "";
@@ -7,7 +7,7 @@ public final class ClassObjectField implements jet.JetObject {
@org.jetbrains.annotations.NotNull
public ClassObjectField() { /* compiled code */ }
public static final class object implements jet.JetObject {
public static final class object implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
public final java.lang.String getX() { /* compiled code */ }
@@ -15,4 +15,4 @@ public final class ClassObjectField implements jet.JetObject {
private object() { /* compiled code */ }
}
}
}
compiler/testData/asJava/nullabilityAnnotations/ClassWithConstructor.java
+2 -2
View File
@@ -1,4 +1,4 @@
public final class ClassWithConstructor implements jet.JetObject {
public final class ClassWithConstructor implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
public ClassWithConstructor(@org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "nullable", type = "?") java.lang.String nullable, @org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "notNull") java.lang.String notNull) { /* compiled code */ }
}
}
compiler/testData/asJava/nullabilityAnnotations/ClassWithConstructorAndProperties.java
+2 -2
View File
@@ -1,4 +1,4 @@
public final class ClassWithConstructorAndProperties implements jet.JetObject {
public final class ClassWithConstructorAndProperties implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
private final java.lang.String nullable;
@org.jetbrains.annotations.NotNull
@@ -12,4 +12,4 @@ public final class ClassWithConstructorAndProperties implements jet.JetObject {
@org.jetbrains.annotations.NotNull
public ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "nullable", type = "?") java.lang.String nullable, @org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "notNull") java.lang.String notNull) { /* compiled code */ }
}
}
compiler/testData/asJava/nullabilityAnnotations/Generic.java
+2 -2
View File
@@ -1,4 +1,4 @@
public interface Generic <N, NN> extends jet.JetObject {
public interface Generic <N, NN> extends kotlin.jvm.internal.KObject {
N a(@jet.runtime.typeinfo.JetValueParameter(name = "n") N n);
@org.jetbrains.annotations.NotNull
@@ -9,4 +9,4 @@ public interface Generic <N, NN> extends jet.JetObject {
@org.jetbrains.annotations.Nullable
NN b1(@org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "nn", type = "?") NN nn);
}
}
compiler/testData/asJava/nullabilityAnnotations/Primitives.java
+2 -2
View File
@@ -1,4 +1,4 @@
public interface Primitives extends jet.JetObject {
public interface Primitives extends kotlin.jvm.internal.KObject {
int $$int /* Real name is 'int' */(@jet.runtime.typeinfo.JetValueParameter(name = "x") int x);
@org.jetbrains.annotations.Nullable
@@ -40,4 +40,4 @@ public interface Primitives extends jet.JetObject {
float getFloat();
double getDouble();
}
}
compiler/testData/asJava/nullabilityAnnotations/PrivateInClass.java
+2 -2
View File
@@ -1,4 +1,4 @@
public final class PrivateInClass implements jet.JetObject {
public final class PrivateInClass implements kotlin.jvm.internal.KObject {
private final java.lang.String nn = "";
private final java.lang.String n = "";
@@ -9,4 +9,4 @@ public final class PrivateInClass implements jet.JetObject {
private final java.lang.String bar(@jet.runtime.typeinfo.JetValueParameter(name = "a") java.lang.String a, @jet.runtime.typeinfo.JetValueParameter(name = "b", type = "?") java.lang.String b) { /* compiled code */ }
private PrivateInClass(@jet.runtime.typeinfo.JetValueParameter(name = "s", type = "?") java.lang.String s) { /* compiled code */ }
}
}
compiler/testData/asJava/nullabilityAnnotations/PrivateInTrait.java
+2 -2
View File
@@ -1,4 +1,4 @@
public interface PrivateInTrait extends jet.JetObject {
public interface PrivateInTrait extends kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
java.lang.String getNn();
@@ -7,4 +7,4 @@ public interface PrivateInTrait extends jet.JetObject {
@org.jetbrains.annotations.Nullable
java.lang.String bar(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "a") java.lang.String a, @org.jetbrains.annotations.Nullable @jet.runtime.typeinfo.JetValueParameter(name = "b", type = "?") java.lang.String b);
}
}
compiler/testData/asJava/nullabilityAnnotations/Synthetic.java
+3 -3
View File
@@ -1,14 +1,14 @@
public final class Synthetic implements jet.JetObject {
public final class Synthetic implements kotlin.jvm.internal.KObject {
private final void foo() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public Synthetic() { /* compiled code */ }
public final class Inner implements jet.JetObject {
public final class Inner implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
public final void test() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public Inner() { /* compiled code */ }
}
}
}
compiler/testData/asJava/nullabilityAnnotations/Trait.java
+2 -2
View File
@@ -1,4 +1,4 @@
public interface Trait extends jet.JetObject {
public interface Trait extends kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.NotNull
java.lang.String notNull(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "a") java.lang.String a);
@@ -36,4 +36,4 @@ public interface Trait extends jet.JetObject {
@org.jetbrains.annotations.NotNull
void setNotNullVar(@org.jetbrains.annotations.NotNull @jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") java.lang.String p);
}
}
compiler/testData/asJava/nullabilityAnnotations/TraitClassObjectField.java
+3 -3
View File
@@ -1,9 +1,9 @@
public interface TraitClassObjectField extends jet.JetObject {
public interface TraitClassObjectField extends kotlin.jvm.internal.KObject {
TraitClassObjectField.object object$;
@org.jetbrains.annotations.Nullable
java.lang.String x = "";
static final class object implements jet.JetObject {
static final class object implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
private final java.lang.String x = "";
private final java.lang.String y = "";
@@ -15,4 +15,4 @@ public interface TraitClassObjectField extends jet.JetObject {
private object() { /* compiled code */ }
}
}
}