From 6a71d495dd102609724b13296dc4eb5d76192b37 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 28 Aug 2012 17:09:53 +0400 Subject: [PATCH] Constructors for enum entries and class objects have private visibility: test data changed. --- compiler/testData/builtin-classes.txt | 14 +++++++------- .../tests/controlFlowAnalysis/kt1185enums.kt | 2 +- .../diagnostics/tests/declarationChecks/kt1193.kt | 2 +- .../lazyResolve/namespaceComparator/enum.txt | 8 ++++---- .../classObject/ClassObjectDeclaresVal.txt | 2 +- .../classObject/ClassObjectDeclaresVar.txt | 2 +- .../classObject/ClassObjectExtendsTrait.txt | 2 +- .../classObject/ClassObjectExtendsTraitWithTP.txt | 2 +- .../loadKotlin/classObject/SimpleClassObject.txt | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index f994aea079d..2b47d870858 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -132,7 +132,7 @@ public final class jet.ByteRange : jet.Range, jet.ByteIterable { public final val start: jet.Byte public final fun step(/*0*/ step: jet.Int): jet.ByteIterator public final class object jet.ByteRange. : jet.Any { - internal final /*constructor*/ fun (): jet.ByteRange. + private final /*constructor*/ fun (): jet.ByteRange. public final val EMPTY: jet.ByteRange } } @@ -225,7 +225,7 @@ public final class jet.CharRange : jet.Range, jet.CharIterable { public final val start: jet.Char public final fun step(/*0*/ step: jet.Int): jet.CharIterator public final class object jet.CharRange. : jet.Any { - internal final /*constructor*/ fun (): jet.CharRange. + private final /*constructor*/ fun (): jet.CharRange. public final val EMPTY: jet.CharRange } } @@ -327,7 +327,7 @@ public final class jet.DoubleRange : jet.Range { public final val start: jet.Double public final fun step(/*0*/ step: jet.Double): jet.DoubleIterator public final class object jet.DoubleRange. : jet.Any { - internal final /*constructor*/ fun (): jet.DoubleRange. + private final /*constructor*/ fun (): jet.DoubleRange. public final val EMPTY: jet.DoubleRange } } @@ -519,7 +519,7 @@ public final class jet.FloatRange : jet.Range { public final val start: jet.Float public final fun step(/*0*/ step: jet.Float): jet.FloatIterator public final class object jet.FloatRange. : jet.Any { - internal final /*constructor*/ fun (): jet.FloatRange. + private final /*constructor*/ fun (): jet.FloatRange. public final val EMPTY: jet.FloatRange } } @@ -719,7 +719,7 @@ public final class jet.IntRange : jet.Range, jet.IntIterable { public final val start: jet.Int public final fun step(/*0*/ step: jet.Int): jet.IntIterator public final class object jet.IntRange. : jet.Any { - internal final /*constructor*/ fun (): jet.IntRange. + private final /*constructor*/ fun (): jet.IntRange. public final val EMPTY: jet.IntRange } } @@ -830,7 +830,7 @@ public final class jet.LongRange : jet.Range, jet.LongIterable { public final val start: jet.Long public final fun step(/*0*/ step: jet.Long): jet.LongIterator public final class object jet.LongRange. : jet.Any { - internal final /*constructor*/ fun (): jet.LongRange. + private final /*constructor*/ fun (): jet.LongRange. public final val EMPTY: jet.LongRange } } @@ -953,7 +953,7 @@ public final class jet.ShortRange : jet.Range, jet.ShortIterable { public final val start: jet.Short public final fun step(/*0*/ step: jet.Int): jet.ShortIterator public final class object jet.ShortRange. : jet.Any { - internal final /*constructor*/ fun (): jet.ShortRange. + private final /*constructor*/ fun (): jet.ShortRange. public final val EMPTY: jet.ShortRange } } diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt index 8845ac246d7..133c8b2edcc 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt @@ -54,4 +54,4 @@ fun g(me: SomeEnum) = when (me) { fun t2(me: MyEnum) = when (me) { MyEnum.A -> 1 MyEnum.B -> 2 -} +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt index b2ba2797f86..b82fe90b057 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt +++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt @@ -9,4 +9,4 @@ open enum class MyEnum(val i: Int) { enum class MyChildEnum(i: Int, val s: String) : MyEnum(i) { C : MyEnum(3) -} +} \ No newline at end of file diff --git a/compiler/testData/lazyResolve/namespaceComparator/enum.txt b/compiler/testData/lazyResolve/namespaceComparator/enum.txt index 8e0109d6947..5513fdda682 100644 --- a/compiler/testData/lazyResolve/namespaceComparator/enum.txt +++ b/compiler/testData/lazyResolve/namespaceComparator/enum.txt @@ -1,20 +1,20 @@ namespace test internal final enum class test.Test : jet.Enum { - public final /*constructor*/ fun (/*0*/ a: jet.Int): test.Test + protected final /*constructor*/ fun (/*0*/ a: jet.Int): test.Test public final override /*1*/ fun name(): jet.String public final override /*1*/ fun ordinal(): jet.Int internal final class object test.Test. { - internal final /*constructor*/ fun (): test.Test. + private final /*constructor*/ fun (): test.Test. internal final val A: test.Test..A internal final val B: test.Test..B internal final enum entry test.Test..A : test.Test { - internal final /*constructor*/ fun (): test.Test..A + private final /*constructor*/ fun (): test.Test..A public final override /*1*/ fun name(): jet.String public final override /*1*/ fun ordinal(): jet.Int } internal final enum entry test.Test..B : test.Test { - internal final /*constructor*/ fun (): test.Test..B + private final /*constructor*/ fun (): test.Test..B public final override /*1*/ fun name(): jet.String public final override /*1*/ fun ordinal(): jet.Int } diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt index 78075b87e0a..63261acf305 100644 --- a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt +++ b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt @@ -3,7 +3,7 @@ namespace test internal final class test.ClassObjectDeclaresProperty : jet.Any { public final /*constructor*/ fun (): test.ClassObjectDeclaresProperty internal final class object test.ClassObjectDeclaresProperty. : jet.Any { - internal final /*constructor*/ fun (): test.ClassObjectDeclaresProperty. + private final /*constructor*/ fun (): test.ClassObjectDeclaresProperty. internal final val i: jet.Int } } diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt index de13bcc42cd..48c9051a1a1 100644 --- a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt +++ b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt @@ -3,7 +3,7 @@ namespace test internal final class test.ClassObjectDeclaresProperty : jet.Any { public final /*constructor*/ fun (): test.ClassObjectDeclaresProperty internal final class object test.ClassObjectDeclaresProperty. : jet.Any { - internal final /*constructor*/ fun (): test.ClassObjectDeclaresProperty. + private final /*constructor*/ fun (): test.ClassObjectDeclaresProperty. internal final var s: jet.String } } diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt index 2015000753d..bf370702aeb 100644 --- a/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt +++ b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt @@ -5,6 +5,6 @@ internal abstract trait test.Bbb : jet.Any { internal final class test.ClassObjectextendsTrait : jet.Any { public final /*constructor*/ fun (): test.ClassObjectextendsTrait internal final class object test.ClassObjectextendsTrait. : test.Bbb { - internal final /*constructor*/ fun (): test.ClassObjectextendsTrait. + private final /*constructor*/ fun (): test.ClassObjectextendsTrait. } } diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt index 2bda137cde4..830ea23f409 100644 --- a/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt +++ b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt @@ -5,6 +5,6 @@ internal abstract trait test.Bbb : jet.Any { internal final class test.ClassObjectExtendsTraitWithTP : jet.Any { public final /*constructor*/ fun (): test.ClassObjectExtendsTraitWithTP internal final class object test.ClassObjectExtendsTraitWithTP. : test.Bbb { - internal final /*constructor*/ fun (): test.ClassObjectExtendsTraitWithTP. + private final /*constructor*/ fun (): test.ClassObjectExtendsTraitWithTP. } } diff --git a/compiler/testData/loadKotlin/classObject/SimpleClassObject.txt b/compiler/testData/loadKotlin/classObject/SimpleClassObject.txt index 0836f970fa5..b9da1a574d4 100644 --- a/compiler/testData/loadKotlin/classObject/SimpleClassObject.txt +++ b/compiler/testData/loadKotlin/classObject/SimpleClassObject.txt @@ -3,6 +3,6 @@ namespace test internal final class test.SimpleClassObject : jet.Any { public final /*constructor*/ fun (): test.SimpleClassObject internal final class object test.SimpleClassObject. : jet.Any { - internal final /*constructor*/ fun (): test.SimpleClassObject. + private final /*constructor*/ fun (): test.SimpleClassObject. } }