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

Fix tests for 'infix'

Browse Source
This commit is contained in:
Yan Zhulanow
2015-10-07 21:54:33 +03:00
parent 401b1e56c0
commit c39327dd74
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/Infix.kt
Vendored
+4 -4
View File
@@ -8,11 +8,11 @@ class Example {
infix fun Example.toExt(other: Example) = Pair(this, other) infix fun Example.toExt(other: Example) = Pair(this, other)
fun Example.toExtNonInfix(other: Example) = Pair(this, other) fun Example.toExtNonInfix(other: Example) = Pair(this, other)
infix fun Example.toExtWithExtraParams(other: Example, blah: Int = 0) = Pair(this, other) infix fun Example.toExtWithExtraParams(other: Example, <!UNUSED_PARAMETER!>blah<!>: Int = 0) = Pair(this, other)
fun Example.toExtNonInfixWithExtraParams(other: Example, blah: Int = 0) = Pair(this, other) fun Example.toExtNonInfixWithExtraParams(other: Example, <!UNUSED_PARAMETER!>blah<!>: Int = 0) = Pair(this, other)
infix fun Example.toExtDefaultValues(other: Example? = null, blah: Int = 0) = Pair(this, other) infix fun Example.toExtDefaultValues(other: Example? = null, <!UNUSED_PARAMETER!>blah<!>: Int = 0) = Pair(this, other)
fun Example.toExtNonInfixDefaultValues(other: Example? = null, blah: Int = 0) = Pair(this, other) fun Example.toExtNonInfixDefaultValues(other: Example? = null, <!UNUSED_PARAMETER!>blah<!>: Int = 0) = Pair(this, other)
fun Example.withLambda(f: () -> Unit) = Pair(this, f) fun Example.withLambda(f: () -> Unit) = Pair(this, f)
compiler/testData/diagnostics/tests/Infix.txt
Vendored
+4
View File
@@ -2,7 +2,11 @@ package
public fun test(): kotlin.Unit public fun test(): kotlin.Unit
public infix fun Example.toExt(/*0*/ other: Example): Pair<Example, Example> public infix fun Example.toExt(/*0*/ other: Example): Pair<Example, Example>
public infix fun Example.toExtDefaultValues(/*0*/ other: Example? = ..., /*1*/ blah: kotlin.Int = ...): Pair<Example, Example?>
public fun Example.toExtNonInfix(/*0*/ other: Example): Pair<Example, Example> public fun Example.toExtNonInfix(/*0*/ other: Example): Pair<Example, Example>
public fun Example.toExtNonInfixDefaultValues(/*0*/ other: Example? = ..., /*1*/ blah: kotlin.Int = ...): Pair<Example, Example?>
public fun Example.toExtNonInfixWithExtraParams(/*0*/ other: Example, /*1*/ blah: kotlin.Int = ...): Pair<Example, Example>
public infix fun Example.toExtWithExtraParams(/*0*/ other: Example, /*1*/ blah: kotlin.Int = ...): Pair<Example, Example>
public fun Example.withLambda(/*0*/ f: () -> kotlin.Unit): Pair<Example, () -> kotlin.Unit> public fun Example.withLambda(/*0*/ f: () -> kotlin.Unit): Pair<Example, () -> kotlin.Unit>
public final class Example { public final class Example {
compiler/testData/diagnostics/tests/InfixModifierApplicability.txt
Vendored
+1
View File
@@ -5,6 +5,7 @@ public infix fun w2(/*0*/ s: kotlin.String): kotlin.Unit
public infix fun w5(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int): kotlin.Unit public infix fun w5(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int): kotlin.Unit
public infix fun kotlin.String.o1(/*0*/ o: kotlin.String): kotlin.String public infix fun kotlin.String.o1(/*0*/ o: kotlin.String): kotlin.String
public infix fun kotlin.String.o2(/*0*/ o: kotlin.String, /*1*/ o2: kotlin.String? = ...): kotlin.String public infix fun kotlin.String.o2(/*0*/ o: kotlin.String, /*1*/ o2: kotlin.String? = ...): kotlin.String
public infix fun kotlin.String.o3(/*0*/ o: kotlin.String = ..., /*1*/ o2: kotlin.String? = ...): kotlin.String
public infix fun </*0*/ A, /*1*/ B> A.to(/*0*/ that: B): Pair<A, B> public infix fun </*0*/ A, /*1*/ B> A.to(/*0*/ that: B): Pair<A, B>
public infix fun kotlin.String.w3(): kotlin.Unit public infix fun kotlin.String.w3(): kotlin.Unit
public infix fun kotlin.String.w4(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int): kotlin.Unit public infix fun kotlin.String.w4(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int): kotlin.Unit