FIR: rename AMBIGUITY to OVERLOAD_RESOLUTION_AMBIGUITY to match FE 1.0

This commit is contained in:
Mikhail Glukhikh
2021-04-02 11:51:36 +03:00
parent 71397a06fb
commit f0ff9ad5a7
168 changed files with 504 additions and 1197 deletions
@@ -80,6 +80,6 @@ public class CollectionStringImpl implements Collection<String> {
// FILE: main.kt
fun test(x: CollectionStringImpl) {
x.<!AMBIGUITY!>contains<!>("")
x.<!OVERLOAD_RESOLUTION_AMBIGUITY!>contains<!>("")
(x as Collection<String>).contains("")
}
@@ -12,9 +12,9 @@ abstract class KA : A() {
}
fun foo(a: A, ka: KA) {
a.<!AMBIGUITY!>contains<!>("")
a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>contains<!>("")
a.<!NONE_APPLICABLE!>contains<!>(1)
"" <!AMBIGUITY!>in<!> a
"" <!OVERLOAD_RESOLUTION_AMBIGUITY!>in<!> a
1 <!NONE_APPLICABLE!>in<!> a
ka.contains("")
@@ -150,14 +150,14 @@ class Y2 : X() {
fun main() {
X().remove("")
X().<!AMBIGUITY!>removeAt<!>(1)
X().<!OVERLOAD_RESOLUTION_AMBIGUITY!>removeAt<!>(1)
val y: MutableList<String> = Y()
y.removeAt(1)
Y().remove("")
Y().<!AMBIGUITY!>removeAt<!>(1)
Y().<!OVERLOAD_RESOLUTION_AMBIGUITY!>removeAt<!>(1)
X().remove("")
X().<!AMBIGUITY!>removeAt<!>(1)
X().<!OVERLOAD_RESOLUTION_AMBIGUITY!>removeAt<!>(1)
}
@@ -24,7 +24,7 @@ abstract class D : AbstractList<Int>() {
fun main(a: A, b: B, c: ArrayList<Int>) {
a.remove(1)
a.<!AMBIGUITY!>removeAt<!>(0)
a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>removeAt<!>(0)
b.remove(1)
b.removeAt(0)
c.remove(1)