From 518c35fae1d593b587fc2c0a7b39011cb635cfce Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 3 Mar 2015 19:26:22 +0300 Subject: [PATCH] Intrinsic default objects implementation: old test data modification --- compiler/testData/builtin-classes.txt | 53 +++++++++++++++++++ .../arrayExpression.kt | 4 +- .../duplicateClass/collectionMethodStub.txt | 4 ++ .../diagnostics/tests/regressions/kt860.txt | 4 ++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index 3fa317e3c90..cf2c7c52762 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -108,6 +108,10 @@ public final class Byte : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toInt(): kotlin.Int public open override /*1*/ fun toLong(): kotlin.Long public open override /*1*/ fun toShort(): kotlin.Short + + public class object Default { + /*primary*/ private constructor Default() + } } public final class ByteArray : kotlin.Cloneable { @@ -375,6 +379,16 @@ public final class Double : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toInt(): kotlin.Int public open override /*1*/ fun toLong(): kotlin.Long public open override /*1*/ fun toShort(): kotlin.Short + + public class object Default : kotlin.FloatingPointConstants { + /*primary*/ private constructor Default() + public abstract override /*1*/ /*fake_override*/ val NEGATIVE_INFINITY: kotlin.Double + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Double + public abstract override /*1*/ /*fake_override*/ val NaN: kotlin.Double + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Double + public abstract override /*1*/ /*fake_override*/ val POSITIVE_INFINITY: kotlin.Double + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Double + } } public final class DoubleArray : kotlin.Cloneable { @@ -443,6 +457,10 @@ public abstract class Enum> : kotlin.Comparable { public final override /*1*/ fun compareTo(/*0*/ other: E): kotlin.Int public final fun name(): kotlin.String public final fun ordinal(): kotlin.Int + + public class object Default { + /*primary*/ private constructor Default() + } } public trait ExtensionFunction0 { @@ -599,6 +617,16 @@ public final class Float : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toInt(): kotlin.Int public open override /*1*/ fun toLong(): kotlin.Long public open override /*1*/ fun toShort(): kotlin.Short + + public class object Default : kotlin.FloatingPointConstants { + /*primary*/ private constructor Default() + public abstract override /*1*/ /*fake_override*/ val NEGATIVE_INFINITY: kotlin.Float + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Float + public abstract override /*1*/ /*fake_override*/ val NaN: kotlin.Float + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Float + public abstract override /*1*/ /*fake_override*/ val POSITIVE_INFINITY: kotlin.Float + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Float + } } public final class FloatArray : kotlin.Cloneable { @@ -662,6 +690,15 @@ public final class FloatRange : kotlin.Range, kotlin.Progression { + public abstract val NEGATIVE_INFINITY: T + public abstract fun (): T + public abstract val NaN: T + public abstract fun (): T + public abstract val POSITIVE_INFINITY: T + public abstract fun (): T +} + public trait Function0 { public abstract fun invoke(): R } @@ -873,6 +910,10 @@ public final class Int : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toShort(): kotlin.Short public final fun ushr(/*0*/ bits: kotlin.Int): kotlin.Int public final fun xor(/*0*/ other: kotlin.Int): kotlin.Int + + public class object Default { + /*primary*/ private constructor Default() + } } public final class IntArray : kotlin.Cloneable { @@ -1040,6 +1081,10 @@ public final class Long : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toShort(): kotlin.Short public final fun ushr(/*0*/ bits: kotlin.Int): kotlin.Long public final fun xor(/*0*/ other: kotlin.Long): kotlin.Long + + public class object Default { + /*primary*/ private constructor Default() + } } public final class LongArray : kotlin.Cloneable { @@ -1332,6 +1377,10 @@ public final class Short : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toInt(): kotlin.Int public open override /*1*/ fun toLong(): kotlin.Long public open override /*1*/ fun toShort(): kotlin.Short + + public class object Default { + /*primary*/ private constructor Default() + } } public final class ShortArray : kotlin.Cloneable { @@ -1406,6 +1455,10 @@ public final class String : kotlin.Comparable, kotlin.CharSequenc public open override /*1*/ fun length(): kotlin.Int public final fun plus(/*0*/ other: kotlin.Any?): kotlin.String public open override /*1*/ fun subSequence(/*0*/ start: kotlin.Int, /*1*/ end: kotlin.Int): kotlin.CharSequence + + public class object Default { + /*primary*/ private constructor Default() + } } public open class Throwable { diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt index 24cf0984f91..37d1b2bc75a 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt @@ -1,5 +1,7 @@ package bar fun main(args : Array) { - String[] names = ["ads"] + class Some + + Some[] names = ["ads"] } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.txt index 384cb0e6cd1..cbfc6624200 100644 --- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.txt +++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.txt @@ -248,6 +248,10 @@ package kotlin { // -- Module: -- } + public trait FloatingPointConstants { + // -- Module: -- + } + public trait Function0 { // -- Module: -- } diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.txt b/compiler/testData/diagnostics/tests/regressions/kt860.txt index 88a5b0e78db..f021bcaef0f 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt860.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt860.txt @@ -238,6 +238,10 @@ package kotlin { // -- Module: -- } + public trait FloatingPointConstants { + // -- Module: -- + } + public trait Function0 { // -- Module: -- }