From 2a3ffed2283fed63a36ae66c10a699c1dc8b9c49 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 20 Jul 2012 14:19:42 +0400 Subject: [PATCH] LR: Newly passed test data added --- .../diagnostics/NamespaceAsExpression.txt | 12 ++++++++++++ .../lazyResolve/diagnostics/ResolveToJava.txt | 8 ++++++++ .../MultiFilePackageRedeclaration.txt | 13 +++++++++++++ .../diagnostics/redeclarations/kt2247.txt | 18 ++++++++++++++++++ .../diagnostics/regressions/kt26-1.txt | 10 ++++++++++ .../diagnostics/regressions/kt691.txt | 14 ++++++++++++++ .../diagnostics/scopes/Imports-hidden.txt | 16 ++++++++++++++++ .../diagnostics/scopes/ImportsConflicting.txt | 16 ++++++++++++++++ .../scopes/ImportsUselessSimpleImport2.txt | 13 +++++++++++++ .../lazyResolve/diagnostics/scopes/kt1080.txt | 14 ++++++++++++++ .../lazyResolve/diagnostics/scopes/kt1579.txt | 14 ++++++++++++++ .../lazyResolve/diagnostics/scopes/kt1642.txt | 10 ++++++++++ 12 files changed, 158 insertions(+) create mode 100644 compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt create mode 100644 compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt diff --git a/compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt b/compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt new file mode 100644 index 00000000000..75b2efa1e19 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt @@ -0,0 +1,12 @@ +namespace + +// +namespace root + +// +namespace a + +// +internal final val x: [ERROR : Type for a] +internal final val y2: [ERROR : Type for package] +// diff --git a/compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt b/compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt new file mode 100644 index 00000000000..88b5d35e9d2 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt @@ -0,0 +1,8 @@ +namespace + +// +namespace xxx + +// +internal final val l: java.util.List +internal final fun test(/*0*/ l: java.util.List): jet.Tuple0 diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt new file mode 100644 index 00000000000..ea9c6945fdb --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt @@ -0,0 +1,13 @@ +namespace + +// +namespace a + +// +namespace b + +// +internal final class a.b : jet.Any { + public final /*constructor*/ fun (): a.b +} +// diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt new file mode 100644 index 00000000000..7b14d58a7a5 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt @@ -0,0 +1,18 @@ +namespace + +// +namespace kt2247 + +internal final class kt2247.B : jet.Any { + public final /*constructor*/ fun (): kt2247.B + internal final class kt2247.B.Y : jet.Any { + public final /*constructor*/ fun (): kt2247.B.Y + } + internal final class object kt2247.B. : jet.Any { + internal final /*constructor*/ fun (): kt2247.B. + internal final class kt2247.B..Y : jet.Any { + public final /*constructor*/ fun (): kt2247.B..Y + } + } +} +// diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt new file mode 100644 index 00000000000..c797b60066a --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt @@ -0,0 +1,10 @@ +namespace + +// +namespace foo + +// +// +namespace bar + +// diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt new file mode 100644 index 00000000000..59032b1330c --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt @@ -0,0 +1,14 @@ +namespace + +// +namespace foo + +// +namespace bar + +// +namespace buz + +// +// +// diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt b/compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt new file mode 100644 index 00000000000..4371ead246a --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt @@ -0,0 +1,16 @@ +namespace + +// +namespace a + +// +// +namespace b + +internal final val O: b.O +// +// +namespace c + +internal final val O: c.O +// diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt new file mode 100644 index 00000000000..811a9bcabf7 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt @@ -0,0 +1,16 @@ +namespace + +// +namespace a + +// +// +namespace b + +internal final fun foo(): jet.Int +// +// +namespace c + +internal final fun foo(): jet.Int +// diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt new file mode 100644 index 00000000000..00624fddb8a --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt @@ -0,0 +1,13 @@ +namespace + +// +namespace a + +// +// +namespace b + +internal final class b.B : jet.Any { + public final /*constructor*/ fun (): b.B +} +// diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt new file mode 100644 index 00000000000..72425dfddb2 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt @@ -0,0 +1,14 @@ +namespace + +// +namespace kt1080 + +// +// +namespace b + +// +namespace d + +// +// diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt new file mode 100644 index 00000000000..690a2e8fa20 --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt @@ -0,0 +1,14 @@ +namespace + +// +namespace lib + +internal abstract trait lib.WithInner : jet.Any { + internal abstract trait lib.WithInner.Inner : jet.Any { + } +} +// +// +namespace user + +// diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt new file mode 100644 index 00000000000..46adece16cb --- /dev/null +++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt @@ -0,0 +1,10 @@ +namespace + +// +namespace a + +// +namespace java + +// +//