From 72bdacb074548a0257cf37b80821543d79b6c795 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 10 Apr 2014 18:39:42 +0400
Subject: [PATCH] Add explicit return types to several test data files so that
 AST access is not needed

Test cases are chosen so that addition/removal of explicit type will not interfere with the original purpose of the test
---
 .../compiledKotlin/classFun/ClassInParamUsedInFun.kt      | 2 +-
 .../compiledKotlin/classFun/ClassParamUsedInFun.kt        | 2 +-
 .../loadJava/compiledKotlin/classObject/Delegation.kt     | 2 +-
 .../fun/genericWithTypeVariables/FunGenericParam.kt       | 2 +-
 .../fun/genericWithTypeVariables/FunParamParam.kt         | 2 +-
 .../fun/genericWithTypeVariables/FunParamParamErased.kt   | 2 +-
 .../genericWithTypeVariables/FunParamReferencesParam.kt   | 2 +-
 .../genericWithTypeVariables/FunParamTwoUpperBounds.kt    | 2 +-
 .../genericWithTypeVariables/FunParamUpperClassBound.kt   | 2 +-
 .../FunParamUpperClassInterfaceBound.kt                   | 2 +-
 .../FunParamUpperInterfaceBound.kt                        | 2 +-
 .../fun/genericWithTypeVariables/FunParamVaragParam.kt    | 2 +-
 .../fun/genericWithTypeVariables/FunTwoTypeParams.kt      | 2 +-
 .../loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt    | 2 +-
 .../compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt       | 2 +-
 .../compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt | 2 +-
 .../loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt      | 2 +-
 .../compiledKotlin/fun/nonGeneric/ExtFunInClass.kt        | 2 +-
 .../compiledKotlin/fun/nonGeneric/FunDefaultArg.kt        | 2 +-
 .../compiledKotlin/fun/nonGeneric/FunParamNotNull.kt      | 2 +-
 .../compiledKotlin/fun/nonGeneric/FunVarargInt.kt         | 2 +-
 .../compiledKotlin/fun/nonGeneric/FunVarargInteger.kt     | 2 +-
 .../compiledKotlin/fun/nonGeneric/ModifierOpen.kt         | 2 +-
 .../loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt       | 2 +-
 .../loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt | 2 +-
 .../compiledKotlin/prop/defaultAccessors/ClassVar.kt      | 6 +++---
 .../prop/defaultAccessors/ClassVarModality.kt             | 8 ++++----
 .../prop/defaultAccessors/ClassVarWithGet.kt              | 6 +++---
 .../prop/defaultAccessors/ClassVarWithSet.kt              | 6 +++---
 29 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt b/compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt
index cf911c50801..f22636bcadb 100644
--- a/compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt
+++ b/compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt
@@ -1,5 +1,5 @@
 package test
 
 class ClassParamUsedInFun<in T> {
-    fun f(t: T) = 1
+    fun f(t: T): Int = 1
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt b/compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt
index 361a543acde..2f133f61372 100644
--- a/compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt
+++ b/compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt
@@ -1,5 +1,5 @@
 package test
 
 class ClassParamUsedInFun<T> {
-    fun f(t: T) = 1
+    fun f(t: T): Int = 1
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt
index 6c534c917e6..a55c7cd57d1 100644
--- a/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt
+++ b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt
@@ -5,7 +5,7 @@ trait T {
 }
 
 class A : T {
-    override fun foo() = 42
+    override fun foo(): Int = 42
 
     class object : T by A()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt
index fa89b067e2c..c34662a218d 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <T> f() = 1
+fun <T> f(): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt
index a696c85f92c..99cfbc06409 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <P> funParamParam(a: Int, b: P) = 1
+fun <P> funParamParam(a: Int, b: P): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt
index a696c85f92c..99cfbc06409 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <P> funParamParam(a: Int, b: P) = 1
+fun <P> funParamParam(a: Int, b: P): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt
index 85ff1201f1c..ed3c8d066a0 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <P, Q : P> funParamReferencesParam() = 1
+fun <P, Q : P> funParamReferencesParam(): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt
index d1d002397aa..e2973f3cd05 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt
@@ -3,6 +3,6 @@ package test
 trait Foo
 trait Bar
 
-fun <T> foo()
+fun <T> foo(): Unit
         where T : Foo, T : Bar
     = Unit.VALUE
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt
index f1835c676f5..6ccce8aecd1 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <A : java.lang.Number> uno() = 1
+fun <A : java.lang.Number> uno(): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
index f7f7dbdb75c..a474fd58084 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <A> tres() where A : java.lang.Number, A : java.io.Serializable = 1
+fun <A> tres(): Int where A : java.lang.Number, A : java.io.Serializable = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
index 0848be9d211..8a43508782f 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <A : java.io.Serializable> dos() = 1
+fun <A : java.io.Serializable> dos(): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt
index 3b3eaac310d..69b7d2a61a3 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <P> funParamVarargParam(a: Int, vararg b: P) = 1
+fun <P> funParamVarargParam(a: Int, vararg b: P): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt
index 283a4b9f140..4b6b5d266de 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <P, Q> funTwoTypeParams() = 1
+fun <P, Q> funTwoTypeParams(): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt
index 685e14a9c09..d2ff91171f4 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt
@@ -1,5 +1,5 @@
 package test
 
 class River {
-    fun song() = 1
+    fun song(): Int = 1
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt
index 7ec2abd7585..c831b06fbf4 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt
@@ -1,5 +1,5 @@
 package test
 
 class ClassFunGetFoo {
-    fun getFoo() = 1
+    fun getFoo(): Int = 1
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt
index e6dc4f9402b..1def771bb40 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt
@@ -1,6 +1,6 @@
 package test
 
 class ClassFunGetFoo {
-    fun getFoo() = 1
+    fun getFoo(): Int = 1
     fun setFoo(p: Int) {}
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt
index 342a67ffed7..50998cf84c9 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt
@@ -1,3 +1,3 @@
 package test
 
-fun Int.shuffle() = 1
+fun Int.shuffle(): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt
index dd27797cc33..71d8472df95 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt
@@ -1,5 +1,5 @@
 package test
 
 class ExtFunInClass {
-    fun Int.shuffle() = 1
+    fun Int.shuffle(): Int = 1
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt
index b71f68aacc9..4587dfc9a67 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt
@@ -1,3 +1,3 @@
 package test
 
-fun funDefaultArg(p: Int, q: Int = 17, r: Int = 18) = 19
+fun funDefaultArg(p: Int, q: Int = 17, r: Int = 18): Int = 19
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt
index 2e95d42a20c..fe4415d9666 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt
@@ -1,3 +1,3 @@
 package test
 
-fun fff(a: java.lang.Integer) = 1
+fun fff(a: java.lang.Integer): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt
index 7dcb019a22a..a6030b8047c 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt
@@ -1,3 +1,3 @@
 package test
 
-fun varargInt(a: Int, vararg b: Int) = 1
+fun varargInt(a: Int, vararg b: Int): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt
index 3e09babb285..5c5aa494fa3 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt
@@ -1,3 +1,3 @@
 package test
 
-fun varargCharSequence(a: Int, vararg b: java.lang.Integer) = 1
+fun varargCharSequence(a: Int, vararg b: java.lang.Integer): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt
index 0483a76957a..bac49113c86 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt
@@ -1,5 +1,5 @@
 package test
 
 open class ModifierOpen {
-    open fun abs() = 1
+    open fun abs(): Int = 1
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt
index 28df28624d5..359aeb9ac92 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt
@@ -1,3 +1,3 @@
 package test
 
-fun f() = 1
+fun f(): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt
index ad76ad8f3eb..9ff91cd0dbc 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt
@@ -1,3 +1,3 @@
 package test
 
-fun getFoo() = 1
+fun getFoo(): Int = 1
diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt
index 30c9606cc6f..267ccefb5b5 100644
--- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt
+++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt
@@ -1,11 +1,11 @@
 package test
 
 class ClassVar() {
-    var property1 = 1
+    var property1: Int = 1
 
-    internal var property2 = 1
+    internal var property2: Int = 1
 
-    private var property3 = Object()
+    private var property3: Object = Object()
 
     protected var property4: String = ""
 
diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt
index 49984a9079e..3fa5224e49b 100644
--- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt
+++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt
@@ -1,14 +1,14 @@
 package test
 
 open class ClassVarModality() {
-    open var property1 = 1
+    open var property1: Int = 1
 
-    final internal var property2 = 1
+    final internal var property2: Int = 1
 
-    open var property3 = 1
+    open var property3: Int = 1
       private set
 
-    final internal var property4 = 1
+    final internal var property4: Int = 1
       private  set
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt
index cfbdf613bf1..345e515ee5e 100644
--- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt
+++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt
@@ -1,13 +1,13 @@
 package test
 
 class ClassVal() {
-    var property1 = 1
+    var property1: Int = 1
       get
 
-    internal var property2 = 1
+    internal var property2: Int = 1
       get
 
-    private var property3 = Object()
+    private var property3: Object = Object()
       get
 
     protected var property4: String = ""
diff --git a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt
index f68cce922bb..0617b323ed2 100644
--- a/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt
+++ b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt
@@ -1,13 +1,13 @@
 package test
 
 class ClassVal() {
-    var property1 = 1
+    var property1: Int = 1
       set
 
-    var property2 = Object()
+    var property2: Object = Object()
       protected set
 
-    var property3 = Object()
+    var property3: Object = Object()
       private set
 
     protected var property4: String = ""