azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kill redeclaration handler in ClassDescriptor

Browse Source
This commit is contained in:
Stepan Koltsov
2012-02-19 22:02:37 +04:00
parent ca8cf6cb49
commit ea8eb7412a
9 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.jet
+2 -2
View File
@@ -1,4 +1,4 @@
class Aaa() {
val <!REDECLARATION, REDECLARATION!>a<!> = 1
val <!REDECLARATION, REDECLARATION!>a<!> = 1
val <!REDECLARATION!>a<!> = 1
val <!REDECLARATION!>a<!> = 1
}
compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.jet
+2 -2
View File
@@ -1,4 +1,4 @@
class Aaa() {
val <!REDECLARATION, REDECLARATION!>a<!> = 1
val <!REDECLARATION, REDECLARATION!>a<!> = ""
val <!REDECLARATION!>a<!> = 1
val <!REDECLARATION!>a<!> = ""
}
compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.jet
+2 -2
View File
@@ -1,9 +1,9 @@
package override.generics
abstract class MyAbstractClass<T> {
abstract val <!REDECLARATION!>pr<!> : T
abstract val pr : T
}
abstract class MyLegalAbstractClass2<T>(t : T) : MyAbstractClass<Int>() {
<!CONFLICTING_OVERLOADS!>val <R> <!REDECLARATION!>pr<!> : T = t<!>
<!CONFLICTING_OVERLOADS!>val <R> pr : T = t<!>
}
compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.jet
+2 -2
View File
@@ -1,7 +1,7 @@
open class Aaa() {
val <!REDECLARATION!>bar<!> = 1
val bar = 1
}
open class Bbb() : Aaa() {
<!CONFLICTING_OVERLOADS!>val <T> <!REDECLARATION!>bar<!> = "aa"<!>
<!CONFLICTING_OVERLOADS!>val <T> bar = "aa"<!>
}
compiler/testData/diagnostics/tests/override/Generics.jet
+4 -4
View File
@@ -6,7 +6,7 @@ trait MyTrait<T> {
abstract class MyAbstractClass<T> {
abstract fun bar(t: T) : T
abstract val <!REDECLARATION, REDECLARATION, REDECLARATION!>pr<!> : T
abstract val pr : T
}
trait MyProps<T> {
@@ -43,7 +43,7 @@ abstract class MyAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalGenericClass1<!><T> : MyTrait<T>, MyAbstractClass<T>() {}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalGenericClass2<!><T, R>(r : R) : MyTrait<T>, MyAbstractClass<R>() {
<!NOTHING_TO_OVERRIDE!>override<!> fun foo(r: R) = r
<!CONFLICTING_OVERLOADS!><!NOTHING_TO_OVERRIDE!>override<!> val <T> <!REDECLARATION!>pr<!> : R = r<!>
<!CONFLICTING_OVERLOADS!><!NOTHING_TO_OVERRIDE!>override<!> val <T> pr : R = r<!>
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass1<!> : MyTrait<Int>, MyAbstractClass<String>() {}
abstract class MyLegalAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {}
@@ -51,10 +51,10 @@ abstract class MyLegalAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass2<!><T>(t : T) : MyTrait<Int>, MyAbstractClass<Int>() {
fun foo(t: T) = t
fun bar(t: T) = t
<!CONFLICTING_OVERLOADS!>val <R> <!REDECLARATION!>pr<!> : T = t<!>
<!CONFLICTING_OVERLOADS!>val <R> pr : T = t<!>
}
abstract class MyLegalAbstractClass2<T>(t : T) : MyTrait<Int>, MyAbstractClass<Int>() {
fun foo(t: T) = t
fun bar(t: T) = t
<!CONFLICTING_OVERLOADS!>val <R> <!REDECLARATION!>pr<!> : T = t<!>
<!CONFLICTING_OVERLOADS!>val <R> pr : T = t<!>
}