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

Fix language feature for mod/rem tests for migration to 1.3 version

Browse Source 
After 2e88f5c47d
This commit is contained in:
Mikhail Zarechenskiy
2018-07-03 15:48:05 +03:00
parent 7ee055fccc
commit e2c287c77e
20 changed files with 126 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/operatorRem/DeprecatedModAssignOperatorConventions.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !WITH_NEW_INFERENCE
// !DIAGNOSTICS: -UNUSED_PARAMETER
compiler/testData/diagnostics/tests/operatorRem/DeprecatedModOperatorConventions.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !WITH_NEW_INFERENCE
// !DIAGNOSTICS: -UNUSED_PARAMETER
compiler/testData/diagnostics/tests/operatorRem/deprecatedModConvention.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER
object ModAndRem {
compiler/testData/diagnostics/tests/operatorRem/doNotResolveToInapplicableRem.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !WITH_NEW_INFERENCE
// !DIAGNOSTICS: -UNUSED_PARAMETER
compiler/testData/diagnostics/tests/operatorRem/modWithRemAssign.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER, -EXTENSION_SHADOWED_BY_MEMBER
class ModAndRemAssign {
compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0_after.kt
Vendored
+48
View File
@@ -0,0 +1,48 @@
// !LANGUAGE: +ProhibitOperatorMod
// !WITH_NEW_INFERENCE
// !API_VERSION: 1.0
// !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE, -EXTENSION_SHADOWED_BY_MEMBER
class Foo {
operator fun rem(x: Int): Foo = Foo()
}
class Bar {
operator fun remAssign(x: Int) {}
}
class Baz {
companion object {
operator fun rem(x: Int) {}
operator fun Int.rem(x: Int) {}
}
}
operator fun Baz.rem(x: Int) {}
fun local() {
operator fun Int.rem(x: Int) {}
operator fun String.remAssign(x: Int) {}
}
class WithMod {
<!FORBIDDEN_BINARY_MOD!>operator<!> fun mod(other: WithMod) = this
fun test() {
val a = this <!OI;FORBIDDEN_BINARY_MOD_AS_REM!>%<!> <!NI;TYPE_MISMATCH!>this<!>
var b = this.mod(this)
<!NI;TYPE_MISMATCH!>b <!OI;FORBIDDEN_BINARY_MOD_AS_REM!>%=<!> <!NI;TYPE_MISMATCH!>this<!><!>
}
}
fun noOverflow() {
(-1).mod(5)
}
fun builtIns(b: Byte, s: Short) {
var a = 1 % 2
a <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE!>%=<!> 3
1.mod(2)
b % <!NI;TYPE_MISMATCH!>s<!>
1.0 % <!NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>2.0<!>
}
compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0.txt → compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0_after.txt
Vendored
View File
compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0.kt → compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0_before.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !WITH_NEW_INFERENCE
// !API_VERSION: 1.0
// !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE, -EXTENSION_SHADOWED_BY_MEMBER
compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0_before.txt
Vendored
+47
View File
@@ -0,0 +1,47 @@
package
public fun builtIns(/*0*/ b: kotlin.Byte, /*1*/ s: kotlin.Short): kotlin.Unit
public fun local(): kotlin.Unit
public fun noOverflow(): kotlin.Unit
public operator fun Baz.rem(/*0*/ x: kotlin.Int): kotlin.Unit
public final class Bar {
public constructor Bar()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final operator fun remAssign(/*0*/ x: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class Baz {
public constructor Baz()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final operator fun rem(/*0*/ x: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final operator fun kotlin.Int.rem(/*0*/ x: kotlin.Int): kotlin.Unit
}
}
public final class Foo {
public constructor Foo()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final operator fun rem(/*0*/ x: kotlin.Int): Foo
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class WithMod {
public constructor WithMod()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final operator fun mod(/*0*/ other: WithMod): WithMod
public final fun test(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/operatorRem/preferRemAsExtentionOverMod.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER
class Foo {
compiler/testData/diagnostics/tests/operatorRem/preferRemAsMemberOverMod.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER
class Foo {
compiler/testData/diagnostics/tests/operatorRem/preferRemFromCompanionObjectOverRem.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER
class A {
compiler/testData/diagnostics/tests/operatorRem/preferRemOverModInLocalFunctions.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER
object B
compiler/testData/diagnostics/tests/operatorRem/preferRemWithImplicitReceivers.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER
class A {
compiler/testData/diagnostics/tests/operatorRem/prefereRemAsExtensionOverMemberMod.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER
class Foo {
compiler/testData/diagnostics/tests/operatorRem/remWithModAndModAssign.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER, -EXTENSION_SHADOWED_BY_MEMBER
class ModAndRemAssign {
compiler/testData/diagnostics/tests/operatorRem/remWithModAssign.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER
object RemAndModAssign {
compiler/testData/diagnostics/tests/operatorRem/resolveModIfRemIsHidden.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// !DIAGNOSTICS: -UNUSED_PARAMETER
object A {
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
Generated
+8 -3
View File
@@ -13833,9 +13833,14 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
runTest("compiler/testData/diagnostics/tests/operatorRem/noOperatorRemFeature.kt");
}
@TestMetadata("noWarningForModFromBuiltinsWhenApi1_0.kt")
public void testNoWarningForModFromBuiltinsWhenApi1_0() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0.kt");
@TestMetadata("noWarningForModFromBuiltinsWhenApi1_0_after.kt")
public void testNoWarningForModFromBuiltinsWhenApi1_0_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0_after.kt");
}
@TestMetadata("noWarningForModFromBuiltinsWhenApi1_0_before.kt")
public void testNoWarningForModFromBuiltinsWhenApi1_0_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0_before.kt");
}
@TestMetadata("numberRemConversions.kt")
compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
Generated
+8 -3
View File
@@ -13833,9 +13833,14 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
runTest("compiler/testData/diagnostics/tests/operatorRem/noOperatorRemFeature.kt");
}
@TestMetadata("noWarningForModFromBuiltinsWhenApi1_0.kt")
public void testNoWarningForModFromBuiltinsWhenApi1_0() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0.kt");
@TestMetadata("noWarningForModFromBuiltinsWhenApi1_0_after.kt")
public void testNoWarningForModFromBuiltinsWhenApi1_0_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0_after.kt");
}
@TestMetadata("noWarningForModFromBuiltinsWhenApi1_0_before.kt")
public void testNoWarningForModFromBuiltinsWhenApi1_0_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorRem/noWarningForModFromBuiltinsWhenApi1_0_before.kt");
}
@TestMetadata("numberRemConversions.kt")