Fix maven build + ~50 compiler tests broken by UNUSED_PARAMETER in main

2018-10-26 14:08:11 +03:00
parent c54eb7db97
commit cb92009862
51 changed files with 56 additions and 53 deletions
@@ -1 +1 @@
-fun main(args: Array<String>) {}
+fun main() {}
@@ -1,7 +1,7 @@
 import kotlin.Pair
 import library.sample.*

-fun main(args: Array<String>) {
+fun main() {
    val p = Pair(10, 20)
    val x = pairAdd(p)
    println("x=$x")
@@ -2,6 +2,6 @@ interface A {
    fun test() = "OK"
 }

-fun main(args: Array<String>) {
+fun main() {
    println(object : A {}.test())
 }
@@ -1,10 +1,7 @@
 warning: unable to find kotlin-stdlib.jar in the Kotlin home directory. Pass either '-no-stdlib' to prevent adding it to the classpath, or the correct '-kotlin-home'
 warning: unable to find kotlin-script-runtime.jar in the Kotlin home directory. Pass either '-no-stdlib' to prevent adding it to the classpath, or the correct '-kotlin-home'
 warning: unable to find kotlin-reflect.jar in the Kotlin home directory. Pass either '-no-reflect' or '-no-stdlib' to prevent adding it to the classpath, or the correct '-kotlin-home'
-compiler/testData/cli/jvm/simple.kt:1:16: error: unresolved reference: Array
-fun main(args: Array<String>) = println("hello world")
-               ^
-compiler/testData/cli/jvm/simple.kt:1:33: error: unresolved reference: println
-fun main(args: Array<String>) = println("hello world")
-                                ^
+compiler/testData/cli/jvm/simple.kt:1:14: error: unresolved reference: println
+fun main() = println("hello world")
+             ^
 COMPILATION_ERROR
@@ -2,7 +2,7 @@ package beforeTest //package name should be less than imported one

 import test.*

-fun main(args: Array<String>) {
+fun main() {
    "O".switchMapOnce {

        "K".switchMapOnce {
@@ -1 +1 @@
-fun main(args: Array<String>) = println("hello world")
+fun main() = println("hello world")
@@ -3,7 +3,8 @@ fun box(): String {
    return "OK"
 }

-fun main(<!UNUSED_PARAMETER!>args<!>: Array<String>) {
+fun main(args: Array<String>) {
+    args.size
    D.foo(array())
 }

@@ -4,7 +4,7 @@ inline fun foo(f: () -> Unit) = f()

 var ok = "Fail"

-fun main(args : Array<String>) {
+fun main() {
    foo {
        ok = "OK"
    }
@@ -2,7 +2,7 @@ package foo

 var ok = "FAIL"

-fun main(args: Array<String>) {
+fun main() {
    ok = "OK"
 }

@@ -3,6 +3,7 @@ package foo
 var ok = "FAIL"

 fun main(args: kotlin.Array<kotlin.String>) {
+    args.size
    ok = "OK"
 }

@@ -4,7 +4,7 @@ var ok = "FAIL"

 val hello = Pair("Hello", "World")

-fun main(args: Array<String>) {
+fun main() {
    ok = "OK"
    println(hello.first + " " + hello.second)
 }
@@ -5,7 +5,7 @@ import kotlin.js.Date

 var ok = "FAIL"

-fun main(args: Array<String>) {
+fun main() {
    val x = ClassA().value
    if (x == 100) {
        ok = "OK"
@@ -5,7 +5,7 @@ import kotlin.js.Date

 var ok = "FAIL"

-fun main(args: Array<String>) {
+fun main() {
    val x = ClassA().value
    if (x == 100) {
        ok = "OK"
@@ -5,7 +5,7 @@ import kotlin.js.Date

 var ok = "FAIL"

-fun main(args: Array<String>) {
+fun main() {
    val x = ClassA().value
    if (x == 100 && Date().extFun() == "Date.extFun" && ClassA().extFun() == "ClassA.extFun") {
        ok = "OK"
@@ -5,7 +5,7 @@ import kotlin.js.Date

 var ok = "FAIL"

-fun main(args: Array<String>) {
+fun main() {
    val x = ClassA().value
    if (x == 100 && Date().extFun() == "Date.extFun" && ClassA().extFun() == "ClassA.extFun") {
        ok = "OK"
@@ -3,6 +3,7 @@ package foo
 var ok = "FAIL"

 fun main(vararg args: kotlin.String) {
+    args.size
    ok = "OK"
 }

@@ -4,7 +4,7 @@ import library.sample.*

 var ok = "FAIL"

-fun main(args: Array<String>) {
+fun main() {
    val x = ClassA().value
    if (x == 100) {
        ok = "OK"
@@ -4,7 +4,7 @@ import library.sample.*

 var ok = "FAIL"

-fun main(args: Array<String>) {
+fun main() {
    val x = ClassA().value
    if (x == 100) {
        ok = "OK"
@@ -1,6 +1,6 @@
 package hello

-fun main(args : Array<String>) {
+fun main() {
    for (s in listOf("a")) {
        println("Hello, $s!")
    }
@@ -1,6 +1,6 @@
 package hello

-fun main(args : Array<String>) {
+fun main() {
    for (s in arrayListOf("a"))
      println("Hello, $s!")

@@ -21,7 +21,7 @@ public fun invokeOnB(b: B) = b.z + b.test()

 public fun invokeOnC(c: C) = c.z + c.test()

-fun main(args: Array<String>) {
+fun main() {
    val b = B()
    println(invokeOnA(b))
    println(invokeOnB(b))
@@ -6,7 +6,7 @@ import javax.crypto.Cipher
 import com.sun.crypto.provider.SunJCE
 import sun.nio.ByteBuffered

-fun main(args : Array<String>) {
+fun main() {
    val a = Big5() // charsets.jar
    val c = DNSNameService() // dnsns.jar
    val e : Cipher? = null // jce.jar
@@ -4,6 +4,6 @@ fun foo(a: Any) = foo(1)

 fun foo(i: Int) = "foo(Int)"

-fun main(args: Array<String>) {
+fun main() {
    println(foo(""))
 }
@@ -1,5 +1,5 @@
 package pkg

-fun main(args : Array<String>) {
+fun main() {
    println("A.main Ok")
 }
@@ -1,5 +1,5 @@
 package pkg

-fun main(args : Array<String>) {
+fun main() {
    println("B.main Ok")
 }
@@ -1,6 +1,6 @@
 package hello

-fun main(args : Array<String>) {
+fun main() {
    for (s in arrayListOf("a"))
      println("Hello, $s!")
    foo()
@@ -1,6 +1,6 @@
 package hello

-fun main(args : Array<String>) {
+fun main() {
    val systemClassLoader = ClassLoader.getSystemClassLoader()
    val moduleName = "META-INF/test.kotlin_module"
    val resourceAsStream = systemClassLoader.getResourceAsStream(moduleName)
@@ -1,6 +1,6 @@
 package hello

-fun main(args : Array<String>) {
+fun main() {
    val systemClassLoader = ClassLoader.getSystemClassLoader()
    val moduleName = "META-INF/build.kotlin_module"
    val resourceAsStream = systemClassLoader.getResourceAsStream(moduleName)
@@ -1,6 +1,6 @@
 package hello

-fun main(args: Array<String>) {
+fun main() {
    val systemClassLoader = ClassLoader.getSystemClassLoader()
    val moduleFile = "META-INF/build.kotlin_module"
    val resourceAsStream = systemClassLoader.getResourceAsStream(moduleFile)
@@ -9,7 +9,7 @@ fun foo() {}
@AnnInt(intArrayOf(1, 2))
 fun bar() {}

-fun main(args: Array<String>) {
+fun main() {
    foo()
    bar()
 }
@@ -8,6 +8,6 @@ interface T {
    abstract fun foo()
 }

-fun main(args : Array<String>) {
+fun main() {
    println("Hi!")
 }
@@ -9,7 +9,7 @@ fun foo() {}
@AnnInt(intArrayOf(1, 2))
 fun bar() {}

-fun main(args: Array<String>) {
+fun main() {
    foo()
    bar()
 }
@@ -5,6 +5,6 @@ val foo: Int = 6

 operator fun Int.invoke() = this

-fun main(args: Array<String>) {
+fun main() {
    println(foo())
 }
@@ -1,5 +1,5 @@
 package hello

-fun main(args : Array<String>) {
+fun main() {
    println("Hi!")
 }
@@ -1,5 +1,5 @@
 package hello

-fun main(args : Array<String>) {
+fun main() {
    println("Yo!")
 }
@@ -1,5 +1,5 @@
 package hello

-fun main(args: Array<String>) {
+fun main() {
    println("Hello!")
 }
@@ -9,7 +9,7 @@ fun foo() {}
@AnnInt(intArrayOf(1, 2))
 fun bar() {}

-fun main(args: Array<String>) {
+fun main() {
    foo()
    bar()
 }
@@ -1,5 +1,5 @@
 package Hello

-fun main(args : Array<String>) {
+fun main() {
    a
 }
@@ -1,5 +1,5 @@
 package Hello

-fun main(args : Array<String>) {
+fun main() {
    System.out.println("Hello!")
 }
@@ -1,5 +1,6 @@
 package Hello

 fun main(args: kotlin.Array<kotlin.String>) {
+    args.size
    System.out.println("Hello from fully qualified main!")
 }
@@ -1,6 +1,7 @@
 package Hello

 fun main(args: Array<String>) {
+    args.size
    System.out.println("Hello!")
 }

@@ -1,5 +1,6 @@
 package Hello

 fun main(vararg args: kotlin.String) {
+    args.size
    System.out.println("Hello from vararg main!")
 }
@@ -1,5 +1,5 @@
 package InlineOnly

-fun main(args : Array<String>) {
-    error("my error")
+fun main(args: Array<String>) {
+    error("my error: ${args.size}")
 }
@@ -1,6 +1,6 @@

 ERR:
-Exception in thread "main" java.lang.IllegalStateException: my error
+Exception in thread "main" java.lang.IllegalStateException: my error: 0
 	at InlineOnly.InlineOnlyKt.main(inlineOnly.kt:4)

 Return code: 1
@@ -1,4 +1,4 @@
 package test

-fun main(args: Array<String>) {
+fun main() {
 }
@@ -1,5 +1,5 @@
 package test

-fun main(args: Array<String>) {
+fun main() {
    println("Hello!")
 }
@@ -1,6 +1,6 @@
 class Foo(val bar: String?)

-fun main(args: Array<String>) {
+fun main() {
    try {
        if (Foo::bar.returnType.isMarkedNullable) {
            print("Foo#bar is nullable")
@@ -2,7 +2,7 @@ expect class Printer() {
    fun print(message: String)
 }

-fun main(args: Array<String>) {
+fun main() {
    val printer = Printer()
    printer.print("Hello, world!")
 }
@@ -47,7 +47,7 @@ class CompilerFileLimitTest : CompilerSmokeTestBase() {
                    appendln("// kotlin rules ... and stuff")
                }
            }
-            appendln("fun main(args: Array<String>)")
+            appendln("fun main()")
            appendln("{")
            appendln("\tval result = Class5().foo() + Class$size().foo()")
            appendln("\tprintln(result)")
@@ -81,7 +81,7 @@ class CompilerFileLimitTest : CompilerSmokeTestBase() {
        return buildString {
            append("package usesLarge\n\n")
            append("import large.Large\n\n")
-            appendln("fun main(args: Array<String>)")
+            appendln("fun main()")
            appendln("{")
            appendln("\tval result = Large.Class0().foo() + Large.Class$size().foo()")
            appendln("\tprintln(result)")
@@ -1,5 +1,5 @@
 package org.jetbrains.kotlin.test

-fun main(args: Array<String>) {
+fun main() {
    println("OK")
 }
@@ -1,2 +1,2 @@
-fun main(vararg args: String) {
+fun main() {
 }