Got rid of "namespace" word in test data.

This commit is contained in:
Evgeny Gerashchenko
2014-01-10 23:42:19 +04:00
parent ee3312fb00
commit 958f7c862d
102 changed files with 302 additions and 306 deletions
@@ -1,5 +1,5 @@
// FILE: b.kt
package MyNamespace
package MyPackage
//properties
<!MUST_BE_INITIALIZED!>val a: Int<!>
val a1: Int = 1
@@ -31,7 +31,7 @@ fun Any?.vars(<!UNUSED_PARAMETER!>a<!>: Any?) : Int {
if (example.ns.y is Int) {
b = <!UNUSED_VALUE, DEBUG_INFO_AUTOCAST!>example.ns.y<!>
}
// if (namespace.bottles.ns.y is Int) {
// if (package.bottles.ns.y is Int) {
// b = ns.y
// }
if (Obj.y is Int) {
@@ -1,4 +1,4 @@
//namespace override
package override
trait T {
fun foo()
@@ -107,7 +107,7 @@ class TestBackingFieldsVisibility() {
<!INACCESSIBLE_BACKING_FIELD!>a.$a<!> = 3
}
val x = <!INACCESSIBLE_BACKING_FIELD!>$namespaceLevelVar<!>
val x = <!INACCESSIBLE_BACKING_FIELD!>$topLevelVar<!>
inner class Inner() {
val z = this@TestBackingFieldsVisibility.$x
@@ -117,7 +117,7 @@ class TestBackingFieldsVisibility() {
get() = $w //test there is no second error here
}
val namespaceLevelVar = 11
val topLevelVar = 11
class T() {
val z : Int get() = 42
@@ -1,13 +1,13 @@
// FILE: ns1.kt
// check no error in overload in different namespaces
// FILE: pkg1.kt
// check no error in overload in different packages
package ns1
package pkg1
fun e() = 1
// FILE: ns2.kt
package ns2
// FILE: pkg2.kt
package pkg2
fun e() = 1
// FILE: ns3ns1.kt
package ns3.ns1
// FILE: pkg3pkg1.kt
package pkg3.pkg1
fun e() = 1
@@ -14,7 +14,7 @@ class A() {
val x = { <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!> }
}
//in a namespace
//in a package
val x = { <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!> }
//KT-787 AssertionError on code 'val x = x'