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

FIR: handle unresolved modality as questionable

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-03-21 13:11:56 +03:00
parent 737ec37486
commit a99578c354
33 changed files with 101 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/fir/rawBuilder/declarations/F.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: F.kt
public? open class A() {
}
public? final class B() : A {
public? final? class B() : A {
}
compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ FILE: NestedOfAliasedType.kt
}
public? final typealias TA = A
public? final class B() : TA {
public? final class NestedInB() : Nested {
public? final? class B() : TA {
public? final? class NestedInB() : Nested {
}
}
compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt
Vendored
+2 -2
View File
@@ -7,8 +7,8 @@ FILE: NestedSuperType.kt
}
}
public? final class Your() : My {
public? final class NestedThree() : NestedOne {
public? final? class Your() : My {
public? final? class NestedThree() : NestedOne {
}
}
compiler/testData/fir/rawBuilder/declarations/complexTypes.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
FILE: complexTypes.kt
<T, out S> public? final class C() {
<R, in P> public? final class D(inner) {
<T, out S> public? final? class C() {
<R, in P> public? final? class D(inner) {
}
}
public? final interface Test() {
public? final property x(val): a.b.C<out CharSequence, *>.D<in List<*>, *>
public? final? interface Test() {
public? final? property x(val): a.b.C<out CharSequence, *>.D<in List<*>, *>
public? get(): a.b.C<out CharSequence, *>.D<in List<*>, *>
}
compiler/testData/fir/rawBuilder/declarations/derivedClass.txt
Vendored
+2 -2
View File
@@ -3,10 +3,10 @@ FILE: derivedClass.kt
public? constructor(x: T)
}
<T : Any> public? final class Derived() : Base<T> {
<T : Any> public? final? class Derived() : Base<T> {
public? constructor(x: T)STUB
}
<T : Any> public? final function create(x: T): Derived<T> {
<T : Any> public? final? function create(x: T): Derived<T> {
STUB
}
compiler/testData/fir/rawBuilder/declarations/enums.txt
Vendored
+8 -8
View File
@@ -1,5 +1,5 @@
FILE: enums.kt
public? final enum class Order() {
public? final? enum class Order() {
public? final enum entry FIRST() {
}
@@ -10,34 +10,34 @@ FILE: enums.kt
}
}
public? final enum class Planet() {
public? final? enum class Planet() {
public? constructor(m: Double, r: Double)
public? final enum entry MERCURY() : Planet {
public? final override function sayHello(): <implicit> {
public? open? override function sayHello(): <implicit> {
}
}
public? final enum entry VENERA() : Planet {
public? final override function sayHello(): <implicit> {
public? open? override function sayHello(): <implicit> {
}
}
public? final enum entry EARTH() : Planet {
public? final override function sayHello(): <implicit> {
public? open? override function sayHello(): <implicit> {
}
}
public? final property g(val): Double = STUB
public? final? property g(val): Double = STUB
public? get(): Double
public? abstract function sayHello(): <implicit>
public? final object Companion(companion) {
public? final const property G(val): <implicit> = STUB
public? final? object Companion(companion) {
public? final? const property G(val): <implicit> = STUB
public? get(): <implicit>
}
compiler/testData/fir/rawBuilder/declarations/enums2.txt
Vendored
+6 -6
View File
@@ -1,22 +1,22 @@
FILE: enums2.kt
public? final interface Some() {
public? final? interface Some() {
}
public? final object O1() : Some {
public? final? object O1() : Some {
}
public? final object O2() : Some {
public? final? object O2() : Some {
}
public? final enum class SomeEnum() {
public? final? enum class SomeEnum() {
public? constructor(x: Some)
public? final enum entry FIRST() : SomeEnum {
public? final override function check(y: Some): Boolean {
public? open? override function check(y: Some): Boolean {
STUB
}
}
public? final enum entry SECOND() : SomeEnum {
public? final override function check(y: Some): Boolean {
public? open? override function check(y: Some): Boolean {
STUB
}
compiler/testData/fir/rawBuilder/declarations/functionTypes.txt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
FILE: functionTypes.kt
<T> public? final function simpleRun(f: ( (<no name provided>: T): Unit )): Unit {
<T> public? final? function simpleRun(f: ( (<no name provided>: T): Unit )): Unit {
STUB
}
<T, R> public? final function simpleMapList<T>.(f: ( (<no name provided>: T): R )): R {
<T, R> public? final? function simpleMapList<T>.(f: ( (<no name provided>: T): R )): R {
}
<T> public? final function simpleWith(t: T, f: ( T.(): Unit )): Unit {
<T> public? final? function simpleWith(t: T, f: ( T.(): Unit )): Unit {
STUB
}
compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
FILE: genericFunctions.kt
public? final interface Any() {
public? final? interface Any() {
}
<T : Any> public? final inline function safeAsAny.(): T? {
<T : Any> public? final? inline function safeAsAny.(): T? {
STUB
}
public? abstract class Summator() {
compiler/testData/fir/rawBuilder/declarations/nestedClass.txt
Vendored
+3 -3
View File
@@ -3,13 +3,13 @@ FILE: nestedClass.kt
public? constructor(s: String)
}
public? final class Outer() {
public? final class Derived() : Base {
public? final? class Outer() {
public? final? class Derived() : Base {
public? constructor(s: String)STUB
}
public? final object Obj() : Base {
public? final? object Obj() : Base {
}
}
compiler/testData/fir/rawBuilder/declarations/simpleClass.txt
Vendored
+8 -8
View File
@@ -1,26 +1,26 @@
FILE: simpleClass.kt
public? final interface SomeInterface() {
public? final function foo(x: Int, y: String): String
public? final? interface SomeInterface() {
public? final? function foo(x: Int, y: String): String
public? final property bar(val): Boolean
public? final? property bar(val): Boolean
public? get(): Boolean
}
public? final class SomeClass() : SomeInterface {
private final property baz(val): <implicit> = STUB
public? final? class SomeClass() : SomeInterface {
private final? property baz(val): <implicit> = STUB
public? get(): <implicit>
public? final override function foo(x: Int, y: String): String {
public? open? override function foo(x: Int, y: String): String {
}
public? final override property bar(var): Boolean
public? open? override property bar(var): Boolean
public? get(): <implicit> {
STUB
}
public? set(value: Boolean): <implicit> {
}
public? final property fau(var): Double
public? final? property fau(var): Double
public? get(): Double
public? set(value: Double): R/kotlin.Unit/
compiler/testData/fir/rawBuilder/declarations/simpleFun.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
FILE: simpleFun.kt
public? final function foo(): <implicit> {
public? final? function foo(): <implicit> {
}
compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
FILE: simpleTypeAlias.kt
public? final interface B() {
public? final? interface B() {
}
public? final typealias C = B
public? final class D() : C {
public? final? class D() : C {
}
compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
FILE: typeAliasWithGeneric.kt
public? open class A() {
}
<S, T : A> public? final interface B() {
<S, T : A> public? final? interface B() {
}
public? final typealias C = B<T, A>
public? final class D() : C<A> {
public? final? class D() : C<A> {
}
compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
FILE: typeParameterVsNested.kt
public? final interface Some() {
public? final? interface Some() {
}
<T : Some> public? abstract class My() {
public? final class T(inner) {
public? final? class T(inner) {
}
public? abstract property x(val): T
@@ -16,7 +16,7 @@ FILE: typeParameterVsNested.kt
public? abstract property z(val): test.My.T
public? get(): test.My.T
public? final class Some() : T {
public? final? class Some() : T {
}
}
compiler/testData/fir/rawBuilder/declarations/typeParameters.txt
Vendored
+6 -6
View File
@@ -1,20 +1,20 @@
FILE: typeParameters.kt
<out T : Any> public? final interface List() {
public? final operator function get(index: Int): T
<out T : Any> public? final? interface List() {
public? final? operator function get(index: Int): T
public? final infix function concat(other: List<T>): List<T>
public? final? infix function concat(other: List<T>): List<T>
}
public? final typealias StringList = List<out String>
public? final typealias AnyList = List<*>
<out T : Any> public? abstract class AbstractList() : List<T> {
}
public? final class SomeList() : AbstractList<Int> {
public? final override function get(index: Int): Int {
public? final? class SomeList() : AbstractList<Int> {
public? open? override function get(index: Int): Int {
STUB
}
public? final override function concat(other: List<Int>): List<Int> {
public? open? override function concat(other: List<Int>): List<Int> {
STUB
}
compiler/testData/fir/resolve/NestedOfAliasedType.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FILE: NestedOfAliasedType.kt
}
(resolved) public? final typealias TA = R/<root>.A/
(resolved) public? final class B() : R/<root>.TA = <root>.A/ {
public? final class NestedInB() : R/<root>.A.Nested/ {
public? final? class NestedInB() : R/<root>.A.Nested/ {
}
}
compiler/testData/fir/resolve/NestedSuperType.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ FILE: NestedSuperType.kt
}
(resolved) public? final class Your() : R/p.My/ {
public? final class NestedThree() : R/p.My.NestedOne/ {
public? final? class NestedThree() : R/p.My.NestedOne/ {
}
}
compiler/testData/fir/resolve/multifile/NestedSuperType.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
FILE: NestedSuperType.kt
(resolved) public? final class A() : R/b.B/ {
public? final class NestedInA1() : R/b.B.NestedInB/ {
public? final? class NestedInA1() : R/b.B.NestedInB/ {
}
public? final class NestedInA2() : R/c.C.NestedInC/ {
public? final? class NestedInA2() : R/c.C.NestedInC/ {
}
}
compiler/testData/fir/resolve/simpleClass.txt
Vendored
+7 -7
View File
@@ -1,26 +1,26 @@
FILE: simpleClass.kt
(resolved) public? final interface SomeInterface() {
public? final function foo(x: R/error: Failed to resolve qualified type/, y: R/error: Failed to resolve qualified type/): R/error: Failed to resolve qualified type/
(resolved) public? abstract interface SomeInterface() {
public? final? function foo(x: R/error: Failed to resolve qualified type/, y: R/error: Failed to resolve qualified type/): R/error: Failed to resolve qualified type/
public? final property bar(val): R/error: Failed to resolve qualified type/
public? final? property bar(val): R/error: Failed to resolve qualified type/
public? get(): R/error: Failed to resolve qualified type/
}
(resolved) public? final class SomeClass() : R/<root>.SomeInterface/ {
private final property baz(val): R/error: Not supported: FirImplicitTypeImpl/ = STUB
private final? property baz(val): R/error: Not supported: FirImplicitTypeImpl/ = STUB
public? get(): R/error: Not supported: FirImplicitTypeImpl/
public? final override function foo(x: R/error: Failed to resolve qualified type/, y: R/error: Failed to resolve qualified type/): R/error: Failed to resolve qualified type/ {
public? open? override function foo(x: R/error: Failed to resolve qualified type/, y: R/error: Failed to resolve qualified type/): R/error: Failed to resolve qualified type/ {
}
public? final override property bar(var): R/error: Failed to resolve qualified type/
public? open? override property bar(var): R/error: Failed to resolve qualified type/
public? get(): R/error: Not supported: FirImplicitTypeImpl/ {
STUB
}
public? set(value: R/error: Failed to resolve qualified type/): R/error: Not supported: FirImplicitTypeImpl/ {
}
public? final property fau(var): R/error: Failed to resolve qualified type/
public? final? property fau(var): R/error: Failed to resolve qualified type/
public? get(): R/error: Failed to resolve qualified type/
public? set(value: R/error: Failed to resolve qualified type/): R/kotlin.Unit/
compiler/testData/fir/resolve/simpleTypeAlias.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: simpleTypeAlias.kt
(resolved) public? final interface B() {
(resolved) public? abstract interface B() {
}
(resolved) public? final typealias C = R/<root>.B/
(resolved) public? final class D() : R/<root>.C = <root>.B/ {