Prepare repository for merge into master

j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt

@@ -1 +1 @@
-var d2 : Array<IntArray?>? = Array<IntArray?>(5)
+var d2 : Array<IntArray?>? = arrayOfNulls<IntArray?>(5)

j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt

@@ -1 +1 @@
-var d3 : Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, {Array<IntArray?>(5)})
+var d3 : Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, {arrayOfNulls<IntArray?>(5)})

j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt

@@ -1 +1 @@
-var ss : Array<Array<String?>?>? = Array<Array<String?>?>(5, {Array<String?>(5)})
+var ss : Array<Array<String?>?>? = Array<Array<String?>?>(5, {arrayOfNulls<String?>(5)})

j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt

@@ -1 +1 @@
-var sss : Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, {Array<Array<String?>?>(5, {Array<String?>(5)})})
+var sss : Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, {Array<Array<String?>?>(5, {arrayOfNulls<String?>(5)})})

j2k/tests/testData/ast/boxedType/file/kt-671.jav

@@ -3,6 +3,7 @@ package demo;
 class Test {
   void test() {
     Integer i = Integer.valueOf(100);
-    Short s = Short.valueOf(100);
+    short s = 3;
+    Short ss = Short.valueOf(s);
   }
 }

j2k/tests/testData/ast/boxedType/file/kt-671.kt

@@ -2,6 +2,7 @@ package demo
 open class Test() {
 open fun test() : Unit {
 var i : Int? = Integer.valueOf(100)
-var s : Short? = Short.valueOf(100)
+var s : Short = 3
+var ss : Short? = java.lang.Short.valueOf(s)
 }
 }

j2k/tests/testData/ast/class/file/privateInit.kt

@@ -1,4 +1,4 @@
 public open class MyClass() {
-private open fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit {
+private fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit {
 }
 }

j2k/tests/testData/ast/constructors/file/customerBuilder.kt

@@ -8,9 +8,9 @@ return _firstName
 public open fun getLastName() : String? {
 return _lastName
 }
-private open fun doSmthBefore() : Unit {
+private fun doSmthBefore() : Unit {
 }
-private open fun doSmthAfter() : Unit {
+private fun doSmthAfter() : Unit {
 }
 {
 doSmthBefore()

j2k/tests/testData/ast/constructors/file/genericIdentifier.kt

@@ -1,5 +1,5 @@
 public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
-private val myName : T? = null
+private val myName : T?
 private var myHasDollar : Boolean = false
 private var myNullable : Boolean = true
 public open fun getName() : T? {
@@ -30,8 +30,8 @@ public open class User() {
 class object {
 public open fun main() : Unit {
 var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
-var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
-var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
+var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
+var i3 : Identifier<*>? = Identifier.init<String?>("name")
 }
 }
 }

j2k/tests/testData/ast/constructors/file/identifier.kt

@@ -1,5 +1,5 @@
 public open class Identifier(_myName : String?, _myHasDollar : Boolean) {
-private val myName : String? = null
+private val myName : String?
 private var myHasDollar : Boolean = false
 private var myNullable : Boolean = true
 public open fun getName() : String? {

j2k/tests/testData/ast/field/file/valWithInit.kt

@@ -1,3 +1,3 @@
 open class C() {
-val f : Foo? = Foo(1, 2)
+val f : Foo = Foo(1, 2)
 }

j2k/tests/testData/ast/file/comp/intNullability.kt

@@ -4,6 +4,6 @@ open class Test() {
 open fun test() : Unit {
 var i : Int? = 10
 var j : Int? = 10
-System.out?.println(i + j)
+System.out?.println(i!! + j!!)
 }
 }

j2k/tests/testData/ast/isOperator/expression/complicatedExpression.kt

@@ -1 +1 @@
-(c.getType().getName() is String)
+c.getType().getName() is String

j2k/tests/testData/ast/isOperator/expression/simpleReference.kt

@@ -1 +1 @@
-(a is String)
+a is String

j2k/tests/testData/ast/issues/file/kt-543-boxed.kt

@@ -4,8 +4,8 @@ open fun putInt(i : Int?) : Unit {
 }
 open fun test() : Unit {
 var b : Byte = 10
-putInt((b).toInt())
+putInt(b.toInt())
 var b2 : Byte? = 10
-putInt((b2).toInt())
+putInt(b2?.toInt())
 }
 }

j2k/tests/testData/ast/issues/file/kt-543.kt

@@ -4,6 +4,6 @@ open fun putInt(i : Int) : Unit {
 }
 open fun test() : Unit {
 var b : Byte = 10
-putInt((b).toInt())
+putInt(b.toInt())
 }
 }

j2k/tests/testData/ast/issues/file/kt-638.kt

@@ -1,5 +1,5 @@
 public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
-private val myName : T? = null
+private val myName : T?
 private var myHasDollar : Boolean = false
 private var myNullable : Boolean = true
 public open fun getName() : T? {
@@ -30,9 +30,9 @@ public open class User() {
 class object {
 public open fun main(args : Array<String?>?) : Unit {
 var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
-var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
-var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
+var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
+var i3 : Identifier<*>? = Identifier.init<String?>("name")
 }
 }
 }
-fun main(args : Array<String?>?) = User.main(args)
+fun main(args : Array<String>) = User.main(args as Array<String?>?)