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

Update test data that mentioned old JvmAbi constants

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-01-21 20:07:00 +03:00
parent be5f00ad1c
commit a1f4c06a49
22 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
+4 -4
View File
@@ -2,16 +2,16 @@ 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 = "";
public static final ClassObjectField.object OBJECT$;
public static final ClassObjectField.Default Default;
public ClassObjectField() { /* compiled code */ }
public static final class object implements kotlin.jvm.internal.KObject {
public static final class Default implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
public final java.lang.String getX() { /* compiled code */ }
private final java.lang.String getY() { /* compiled code */ }
private object() { /* compiled code */ }
private Default() { /* compiled code */ }
}
}
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
+4 -4
View File
@@ -1,9 +1,9 @@
public interface TraitClassObjectField {
TraitClassObjectField.object OBJECT$;
TraitClassObjectField.Default Default;
@org.jetbrains.annotations.Nullable
java.lang.String x = "";
static final class object implements kotlin.jvm.internal.KObject {
static final class Default implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
private final java.lang.String x = "";
private final java.lang.String y = "";
@@ -13,6 +13,6 @@ public interface TraitClassObjectField {
private final java.lang.String getY() { /* compiled code */ }
private object() { /* compiled code */ }
private Default() { /* compiled code */ }
}
}
}
compiler/testData/codegen/box/classes/classObjectToString.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class SomeClass { class object }
fun box() =
if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$object@[0-9a-fA-F]+"))
if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$Default@[0-9a-fA-F]+"))
"OK"
else
"Fail: $SomeClass"
compiler/testData/codegen/boxWithStdlib/native/nativePropertyAccessors.kt
+2 -2
View File
@@ -39,8 +39,8 @@ fun box(): String {
return check({defaultGetter}, "_DefaultPackage.getDefaultGetter()I")
?: check({defaultSetter = 1}, "_DefaultPackage.setDefaultSetter(I)V")
?: check({C.defaultGetter}, "C\$object.getDefaultGetter()I")
?: check({C.defaultSetter = 1}, "C\$object.setDefaultSetter(I)V")
?: check({C.defaultGetter}, "C\$Default.getDefaultGetter()I")
?: check({C.defaultSetter = 1}, "C\$Default.setDefaultSetter(I)V")
?: check({C().defaultGetter}, "C.getDefaultGetter()I")
?: check({C().defaultSetter = 1}, "C.setDefaultSetter(I)V")
compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt
+1 -1
View File
@@ -4,5 +4,5 @@ class A {
}
}
// CLASS: A$object$Foo
// CLASS: A$Default$Foo
// HAS_DEFAULT_CONSTRUCTOR: true
compiler/testData/codegen/outerClassInfo/outerClassInfo.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.lang.Object;
class Foo {
class object { }
class Default { }
class InnerClass { }