From ecf5f8228cbc8b27366444f36c2d8d751f4eed4c Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 20 Jul 2012 11:49:38 +0400 Subject: [PATCH] Test data for newly passing tests --- .../lazyResolve/diagnostics/Abstract.txt | 49 ++++++++++++ .../diagnostics/AnonymousInitializers.txt | 10 +++ .../lazyResolve/diagnostics/Constructors.txt | 47 +++++++++++ .../diagnostics/DefaultValuesTypechecking.txt | 10 +++ .../diagnostics/FunctionReturnTypes.txt | 71 +++++++++++++++++ .../lazyResolve/diagnostics/Properties.txt | 12 +++ .../ScopeForSecondaryConstructors.txt | 10 +++ .../ThisConstructorInGenericClass.txt | 5 ++ .../diagnostics/scopes/kt250.617.10.txt | 77 +++++++++++++++++++ 9 files changed, 291 insertions(+) create mode 100644 compiler/testData/lazyResolve/diagnostics/Abstract.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/AnonymousInitializers.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/Constructors.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/DefaultValuesTypechecking.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/FunctionReturnTypes.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/Properties.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/regressions/ScopeForSecondaryConstructors.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/regressions/ThisConstructorInGenericClass.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/scopes/kt250.617.10.txt diff --git a/compiler/testData/lazyResolve/diagnostics/Abstract.txt b/compiler/testData/lazyResolve/diagnostics/Abstract.txt new file mode 100644 index 00000000000..1435d8bca97 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/Abstract.txt @@ -0,0 +1,49 @@ +namespace + +// +namespace MyNamespace + +internal final val a: jet.Int +internal final val a1: jet.Int +internal abstract val a2: jet.Int +internal abstract val a3: jet.Int +internal final var b: jet.Int private set +internal final var b1: jet.Int private set +internal abstract var b2: jet.Int private set +internal abstract var b3: jet.Int private set +internal final var c: jet.Int +internal final var c1: jet.Int +internal abstract var c2: jet.Int +internal abstract var c3: jet.Int +internal final val e: jet.Int +internal final val e1: jet.Int +internal abstract val e2: jet.Int +internal abstract val e3: jet.Int +internal final var i: jet.Int +internal final var i1: jet.Int +internal final var j: jet.Int +internal final var j1: jet.Int +internal final var k: jet.Int +internal final var k1: jet.Int +internal final var l: jet.Int +internal final var l1: jet.Int +internal final var n: jet.Int +internal final fun f(): jet.Tuple0 +internal final fun g(): jet.Tuple0 +internal abstract fun h(): jet.Tuple0 +internal abstract fun j(): jet.Tuple0 +// +internal abstract class B1 : jet.Any { + public final /*constructor*/ fun (/*0*/ i: jet.Int, /*1*/ s: jet.String): B1 + internal final val i: jet.Int + internal final val s: jet.String +} +internal final class B2 : B1 { + public final /*constructor*/ fun (): B2 + internal final override /*1*/ val i: jet.Int + internal final override /*1*/ val s: jet.String +} +internal abstract class B3 : jet.Any { + public final /*constructor*/ fun (/*0*/ i: jet.Int): B3 +} +internal final fun foo(/*0*/ c: B3): jet.Tuple0 diff --git a/compiler/testData/lazyResolve/diagnostics/AnonymousInitializers.txt b/compiler/testData/lazyResolve/diagnostics/AnonymousInitializers.txt new file mode 100644 index 00000000000..98d253cb9d2 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/AnonymousInitializers.txt @@ -0,0 +1,10 @@ +namespace + +internal abstract trait NoC : jet.Any { + internal open val a: jet.Int +} +internal final class WithC : jet.Any { + public final /*constructor*/ fun (): WithC + internal final val a: jet.Int + internal final val x: jet.Int +} diff --git a/compiler/testData/lazyResolve/diagnostics/Constructors.txt b/compiler/testData/lazyResolve/diagnostics/Constructors.txt new file mode 100644 index 00000000000..5fd8e62a67e --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/Constructors.txt @@ -0,0 +1,47 @@ +namespace + +internal final class Foo : WithPC0 { + public final /*constructor*/ fun (): Foo +} +internal open class NoC : jet.Any { + public final /*constructor*/ fun (): NoC +} +internal final class NoC1 : NoC { + public final /*constructor*/ fun (): NoC1 +} +internal final class NoC2 : WithC1 { + public final /*constructor*/ fun (): NoC2 +} +internal final class NoC3 : WithC1 { + public final /*constructor*/ fun (): NoC3 +} +internal final class NoCPI : jet.Any { + public final /*constructor*/ fun (): NoCPI + internal final val a: jet.Int + internal final var ab: jet.Int +} +internal final class WithC0 : NoC { + public final /*constructor*/ fun (): WithC0 +} +internal open class WithC1 : NoC { + public final /*constructor*/ fun (): WithC1 +} +internal final class WithC2 : WithC1 { + public final /*constructor*/ fun (): WithC2 +} +internal final class WithCPI : jet.Any { + public final /*constructor*/ fun (/*0*/ x: jet.Int): WithCPI + internal final val a: jet.Int + internal final val b: jet.Int + internal final val xy: jet.Int +} +internal final class WithCPI_Dup : jet.Any { + public final /*constructor*/ fun (/*0*/ x: jet.Int): WithCPI_Dup + internal final var x: jet.Int +} +internal final class WithPC0 : jet.Any { + public final /*constructor*/ fun (): WithPC0 +} +internal final class WithPC1 : jet.Any { + public final /*constructor*/ fun (/*0*/ a: jet.Int): WithPC1 +} diff --git a/compiler/testData/lazyResolve/diagnostics/DefaultValuesTypechecking.txt b/compiler/testData/lazyResolve/diagnostics/DefaultValuesTypechecking.txt new file mode 100644 index 00000000000..22340720a93 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/DefaultValuesTypechecking.txt @@ -0,0 +1,10 @@ +namespace + +internal final class A : jet.Any { + public final /*constructor*/ fun (/*0*/ x: jet.Int = ?, /*1*/ y: jet.Int = ?): A + internal final fun foo(/*0*/ bool: jet.Boolean, /*1*/ a: jet.Int = ?, /*2*/ b: jet.String = ?): jet.Tuple0 +} +internal final val x: jet.String +internal final val z: jet.Int +internal final fun bar(/*0*/ x: jet.Int = ?, /*1*/ y: jet.Int = ?, /*2*/ z: jet.String = ?): jet.Tuple0 +internal final fun foo(/*0*/ x: jet.Int = ?, /*1*/ y: jet.Int = ?, /*2*/ i: jet.Int = ?): jet.Int diff --git a/compiler/testData/lazyResolve/diagnostics/FunctionReturnTypes.txt b/compiler/testData/lazyResolve/diagnostics/FunctionReturnTypes.txt new file mode 100644 index 00000000000..2a425c0d7bc --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/FunctionReturnTypes.txt @@ -0,0 +1,71 @@ +namespace + +internal final class A : jet.Any { + public final /*constructor*/ fun (): A +} +internal final class B : jet.Any { + public final /*constructor*/ fun (): B + protected final fun f(): jet.String +} +internal final val a: jet.Nothing +internal final fun bbb(): jet.Tuple0 +internal final fun blockAndAndMismatch(): jet.Int +internal final fun blockAndAndMismatch1(): jet.Int +internal final fun blockAndAndMismatch2(): jet.Int +internal final fun blockAndAndMismatch3(): jet.Int +internal final fun blockAndAndMismatch4(): jet.Int +internal final fun blockAndAndMismatch5(): jet.Int +internal final fun blockNoReturnIfEmptyIf(): jet.Int +internal final fun blockNoReturnIfUnitInOneBranch(): jet.Int +internal final fun blockNoReturnIfValDeclaration(): jet.Int +internal final fun blockReturnUnitMismatch(): jet.Int +internal final fun blockReturnValueTypeMatch(): jet.Int +internal final fun blockReturnValueTypeMatch1(): jet.Int +internal final fun blockReturnValueTypeMatch10(): jet.Int +internal final fun blockReturnValueTypeMatch11(): jet.Int +internal final fun blockReturnValueTypeMatch12(): jet.Int +internal final fun blockReturnValueTypeMatch2(): jet.Int +internal final fun blockReturnValueTypeMatch3(): jet.Int +internal final fun blockReturnValueTypeMatch4(): jet.Int +internal final fun blockReturnValueTypeMatch5(): jet.Int +internal final fun blockReturnValueTypeMatch6(): jet.Int +internal final fun blockReturnValueTypeMatch7(): jet.Int +internal final fun blockReturnValueTypeMatch8(): jet.Int +internal final fun blockReturnValueTypeMatch9(): jet.Int +internal final fun blockReturnValueTypeMismatch(): jet.Int +internal final fun blockReturnValueTypeMismatchUnit(): jet.Int +internal final fun f(): jet.Int +internal final fun f1(): jet.Int +public final fun f2(): jet.Int +internal final fun foo(/*0*/ expr: java.lang.StringBuilder): jet.Int +internal final fun illegalConstantBlock(): jet.String +internal final fun illegalConstantBody(): jet.Int +internal final fun illegalIfBlock(): jet.Boolean +internal final fun illegalIfBody(): jet.Int +internal final fun illegalReturnIf(): jet.Char +internal final fun intBlock(): jet.Int +internal final fun intBlock1(): jet.Int +internal final fun intEmpty(): jet.Int +internal final fun intFunctionLiteral(): jet.Int +internal final fun intShort(): jet.Int +internal final fun intShortInfer(): jet.Int +internal final fun intString(): jet.Int +internal final fun nonBlockNoReturnIfUnitInOneBranch(): jet.Int +internal final fun nonBlockReturnIfEmptyIf(): jet.Int +internal final fun none(): jet.Tuple0 +internal final fun returnNothing(): jet.Nothing +internal final fun test1(): jet.Any +internal final fun test2(): jet.Any +internal final fun test3(): jet.Any +internal final fun test4(): jet.Function0 +internal final fun test5(): jet.Any +internal final fun test6(): jet.Any +internal final fun testFunctionLiterals(): jet.Tuple0 +internal final fun unitEmpty(): jet.Tuple0 +internal final fun unitEmptyInfer(): jet.Tuple0 +internal final fun unitEmptyReturn(): jet.Tuple0 +internal final fun unitIntReturn(): jet.Tuple0 +internal final fun unitShort(): jet.Tuple0 +internal final fun unitShortConv(): jet.Tuple0 +internal final fun unitShortNull(): jet.Tuple0 +internal final fun unitUnitReturn(): jet.Tuple0 diff --git a/compiler/testData/lazyResolve/diagnostics/Properties.txt b/compiler/testData/lazyResolve/diagnostics/Properties.txt new file mode 100644 index 00000000000..76840f3e752 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/Properties.txt @@ -0,0 +1,12 @@ +namespace + +internal final class Test : jet.Any { + public final /*constructor*/ fun (): Test + internal final var a: jet.Int + internal final var b: jet.Int + internal final fun f(): jet.Tuple0 + public final val i: jet.Int +} +internal final val p: jet.Int +internal final var x: jet.Int +internal final val xx: jet.Int diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/ScopeForSecondaryConstructors.txt b/compiler/testData/lazyResolve/diagnostics/regressions/ScopeForSecondaryConstructors.txt new file mode 100644 index 00000000000..88cda330823 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/regressions/ScopeForSecondaryConstructors.txt @@ -0,0 +1,10 @@ +namespace + +internal final class Foo : jet.Any { + public final /*constructor*/ fun (/*0*/ bar: jet.Int, /*1*/ barr: jet.Int, /*2*/ barrr: jet.Int): Foo + internal final jet.Int() val a: jet.Int + internal final var bar: jet.Int + internal final var bar: jet.Int + internal final var barr: jet.Int + internal final var barrr: jet.Int +} diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/ThisConstructorInGenericClass.txt b/compiler/testData/lazyResolve/diagnostics/regressions/ThisConstructorInGenericClass.txt new file mode 100644 index 00000000000..30720113013 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/regressions/ThisConstructorInGenericClass.txt @@ -0,0 +1,5 @@ +namespace + +internal final class Z : jet.Any { + public final /*constructor*/ fun (): Z +} diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt250.617.10.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt250.617.10.txt new file mode 100644 index 00000000000..761f0121937 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt250.617.10.txt @@ -0,0 +1,77 @@ +namespace + +// +namespace kt_250_617_10 + +internal open class kt_250_617_10.A : jet.Any { + public final /*constructor*/ fun (/*0*/ x: jet.Int): kt_250_617_10.A + internal final val x: jet.Int +} +internal final class kt_250_617_10.B : kt_250_617_10.A { + public final /*constructor*/ fun (/*0*/ y: jet.Int): kt_250_617_10.B + internal final override /*1*/ val x: jet.Int +} +internal final class kt_250_617_10.Body : kt_250_617_10.BodyTag { + public final /*constructor*/ fun (): kt_250_617_10.Body + internal final override /*1*/ val attributes: java.util.HashMap + internal final override /*1*/ val children: java.util.ArrayList + internal final override /*1*/ fun jet.String.plus(): jet.Tuple0 + internal final override /*1*/ val name: jet.String +} +internal final class kt_250_617_10.Body1 : kt_250_617_10.BodyTag { + public final /*constructor*/ fun (): kt_250_617_10.Body1 + internal final override /*1*/ val attributes: java.util.HashMap + internal final override /*1*/ val children: java.util.ArrayList + internal final override /*1*/ fun jet.String.plus(): jet.Tuple0 + internal final override /*1*/ val name: jet.String +} +internal open class kt_250_617_10.BodyTag : kt_250_617_10.TagWithText { + public final /*constructor*/ fun (/*0*/ name: jet.String): kt_250_617_10.BodyTag + internal final override /*1*/ val attributes: java.util.HashMap + internal final override /*1*/ val children: java.util.ArrayList + internal final override /*1*/ fun jet.String.plus(): jet.Tuple0 + internal final override /*1*/ val name: jet.String +} +internal open class kt_250_617_10.Element : jet.Any { + public final /*constructor*/ fun (): kt_250_617_10.Element +} +internal open class kt_250_617_10.M : jet.Any { + public final /*constructor*/ fun (/*0*/ p: jet.Int): kt_250_617_10.M +} +internal final class kt_250_617_10.N : kt_250_617_10.A { + public final /*constructor*/ fun (/*0*/ p: jet.Int): kt_250_617_10.N + internal final val p: jet.Int + internal final override /*1*/ val x: jet.Int +} +internal abstract class kt_250_617_10.Tag : jet.Any { + public final /*constructor*/ fun (/*0*/ name: jet.String): kt_250_617_10.Tag + internal final val attributes: java.util.HashMap + internal final val children: java.util.ArrayList + internal final val name: jet.String +} +internal abstract class kt_250_617_10.TagWithText : kt_250_617_10.Tag { + public final /*constructor*/ fun (/*0*/ name: jet.String): kt_250_617_10.TagWithText + internal final override /*1*/ val attributes: java.util.HashMap + internal final override /*1*/ val children: java.util.ArrayList + internal final fun jet.String.plus(): jet.Tuple0 + internal final override /*1*/ val name: jet.String +} +internal final class kt_250_617_10.TextElement : kt_250_617_10.Element { + public final /*constructor*/ fun (/*0*/ name: jet.String): kt_250_617_10.TextElement +} +internal open class kt_250_617_10.X : jet.Any { + public final /*constructor*/ fun (/*0*/ p: jet.Int, /*1*/ r: jet.Int): kt_250_617_10.X + internal final val s: jet.String +} +internal final class kt_250_617_10.Y : kt_250_617_10.X { + public final /*constructor*/ fun (/*0*/ i: jet.Int): kt_250_617_10.Y + internal final val rrr: jet.Int + internal final override /*1*/ val s: jet.String +} +internal final class kt_250_617_10.Z : kt_250_617_10.X { + public final /*constructor*/ fun (/*0*/ i: jet.Int): kt_250_617_10.Z + internal final val i: jet.Int + internal final override /*1*/ val s: jet.String + internal final val x: jet.Int +} +//