Prepare repository for merge into master

j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.jav

@@ -0,0 +1 @@
+int[] a = new int[10]

j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.kt

@@ -0,0 +1 @@
+var a : IntArray? = IntArray(10)

j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.jav

@@ -0,0 +1 @@
+Object[] a = new Object[10]

j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.kt

@@ -0,0 +1 @@
+var a : Array<Any?>? = arrayOfNulls<Any?>(10)

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/assignmentExpression/file/nullability.jav

@@ -0,0 +1,9 @@
+import java.util.BitSet;
+
+class Foo {
+  void foo(BitSet o) {
+    BitSet o2 = o;
+    int foo = 0;
+    foo = o2.size();
+  }
+}

j2k/tests/testData/ast/assignmentExpression/file/nullability.kt

@@ -0,0 +1,8 @@
+import java.util.BitSet
+open class Foo() {
+open fun foo(o : BitSet?) : Unit {
+var o2 : BitSet? = o
+var foo : Int = 0
+foo = o2?.size()!!
+}
+}

j2k/tests/testData/ast/boxedType/file/Boxing.jav

@@ -0,0 +1,14 @@
+import java.util.ArrayList;
+import java.util.List;
+
+class Boxing {
+    void test() {
+        Integer i = 0;
+        Number n = 0.0f;
+        i = 1;
+        int j = i;
+        Integer k = i+2;
+        i = null;
+        j = i;
+    }
+}

j2k/tests/testData/ast/boxedType/file/Boxing.kt

@@ -0,0 +1,12 @@
+import java.util.ArrayList
+open class Boxing() {
+open fun test() : Unit {
+var i : Int? = 0
+var n : Number? = 0.0.toFloat()
+i = 1
+var j : Int = i!!
+var k : Int? = i!! + 2
+i = null
+j = i!!
+}
+}

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/ClassShadowing.jav

@@ -0,0 +1,13 @@
+package test;
+
+public class Short {
+	public static Short valueOf(String value) {return new Short();}
+}
+
+class Test {
+	public static void test() {
+		Short.valueOf("1");
+		test.Short.valueOf("1");
+		java.lang.Short.valueOf("1");
+	}
+}

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

@@ -0,0 +1,17 @@
+package test
+public open class Short() {
+class object {
+public open fun valueOf(value : String?) : Short? {
+return Short()
+}
+}
+}
+open class Test() {
+class object {
+public open fun test() : Unit {
+test.Short.valueOf("1")
+test.Short.valueOf("1")
+java.lang.Short.valueOf("1")
+}
+}
+}

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/for/statement/forWithNullCondition.jav

@@ -0,0 +1 @@
+for (init(); ; update()) body();

j2k/tests/testData/ast/for/statement/forWithNullCondition.kt

@@ -0,0 +1,10 @@
+{
+init()
+while (true)
+{
+body()
+{
+update()
+}
+}
+}

j2k/tests/testData/ast/for/statement/forWithNullInit.jav

@@ -0,0 +1 @@
+for (; condition() ; update()) body();

j2k/tests/testData/ast/for/statement/forWithNullInit.kt

@@ -0,0 +1,9 @@
+{
+while (condition())
+{
+body()
+{
+update()
+}
+}
+}

j2k/tests/testData/ast/for/statement/forWithNullUpdate.jav

@@ -0,0 +1 @@
+for (init(); condition(); ) body();

j2k/tests/testData/ast/for/statement/forWithNullUpdate.kt

@@ -0,0 +1,7 @@
+{
+init()
+while (condition())
+{
+body()
+}
+}

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/arrayLength.jav

@@ -0,0 +1,5 @@
+class Test {
+  public static int foo(String[] args) {
+    return args.length;
+  }
+}

j2k/tests/testData/ast/issues/file/arrayLength.kt

@@ -0,0 +1,7 @@
+open class Test() {
+class object {
+public open fun foo(args : Array<String?>?) : Int {
+return args?.size!!
+}
+}
+}

j2k/tests/testData/ast/issues/file/comments.jav

@@ -0,0 +1,22 @@
+// This is an end-of-line comment
+
+/*
+This is a block comment
+*/
+
+
+class C {
+   // This is a class comment
+
+   /**
+    * This is a field doc comment.
+    */
+   private int i;
+
+   /**
+    * This is a function doc comment.
+    */
+   public void foo() {
+       /* This is a function comment */
+   }
+}

j2k/tests/testData/ast/issues/file/comments.kt

@@ -0,0 +1,17 @@
+// This is an end-of-line comment
+/*
+This is a block comment
+*/
+open class C() {
+// This is a class comment
+/**
+ * This is a field doc comment.
+ */
+private var i : Int = 0
+/**
+ * This is a function doc comment.
+ */
+public open fun foo() : Unit {
+/* This is a function comment */
+}
+}

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?>?)

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

@@ -2,6 +2,6 @@ package demo
 open class Test(i : Int) {
 open fun test() : Unit {
 var b : Byte = 10
-Test((b).toInt())
+Test(b.toInt())
 }
 }

j2k/tests/testData/ast/issues/file/kt-794-mixed.kt

@@ -4,6 +4,6 @@ open fun getInteger(i : Int?) : Int? {
 return i
 }
 open fun test() : Unit {
-var i : Int = getInteger(10)
+var i : Int = getInteger(10)!!
 }
 }

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

@@ -13,7 +13,7 @@ open class Test() {
 open fun putInt(i : Int) : Unit {
 }
 open fun test() : Unit {
-putInt((One.myContainer?.myInt)!!)
-IntContainer((One.myContainer?.myInt)!!)
+putInt(One.myContainer?.myInt!!)
+IntContainer(One.myContainer?.myInt!!)
 }
 }

j2k/tests/testData/ast/issues/file/kt-824-isDir.kt

@@ -1,9 +1,12 @@
 package test
 import java.io.File
+/**
+* User: ignatov
+*/
 public open class Test() {
 class object {
 public open fun isDir(parent : File?) : Boolean {
-if (parent == null || !parent?.exists())
+if (parent == null || !parent?.exists()!!)
 {
 return false
 }

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

@@ -4,9 +4,9 @@ open fun test() : String? {
 var s1 : String? = ""
 var s2 : String? = ""
 var s3 : String? = ""
-if ((s1?.isEmpty())!! && (s2?.isEmpty())!!)
+if (s1?.isEmpty()!! && s2?.isEmpty()!!)
 return "OK"
-if ((s1?.isEmpty())!! && (s2?.isEmpty())!! && (s3?.isEmpty())!!)
+if (s1?.isEmpty()!! && s2?.isEmpty()!! && s3?.isEmpty()!!)
 return "OOOK"
 return ""
 }

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

@@ -6,4 +6,4 @@ System.out?.println("Halo!")
 }
 }
 }
-fun main(args : Array<String?>?) = Program.main(args)
+fun main(args : Array<String>) = Program.main(args as Array<String?>?)

j2k/tests/testData/ast/issues/file/qualifyStatic.jav

@@ -0,0 +1,7 @@
+import java.util.Calendar
+
+abstract class MyCalendar extends Calendar {
+    public void foo() {
+        int i = ALL_STYLES;
+    }
+}

j2k/tests/testData/ast/issues/file/qualifyStatic.kt

@@ -0,0 +1,6 @@
+import java.util.Calendar
+abstract class MyCalendar() : Calendar() {
+public open fun foo() : Unit {
+var i : Int = Calendar.ALL_STYLES
+}
+}

j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt

@@ -1,5 +1,4 @@
 package demo
-import java.util.Iterator
 open class Test() : java.lang.Iterable<String?> {
 public override fun iterator() : java.util.Iterator<String?>? {
 return null

j2k/tests/testData/ast/list/file/ForEach.jav

@@ -0,0 +1,14 @@
+import java.util.*;
+
+public class ForEach {
+    public void test() {
+        ArrayList<Object> xs = new ArrayList<Object>();
+        List<Object> ys = new LinkedList<Object>();
+        for (Object x : xs) {
+            ys.add(x);
+        }
+        for (Object y : ys) {
+            xs.add(y);
+        }
+    }
+}

j2k/tests/testData/ast/list/file/ForEach.kt

@@ -0,0 +1,15 @@
+import java.util.*
+public open class ForEach() {
+public open fun test() : Unit {
+var xs : ArrayList<Any?>? = ArrayList<Any?>()
+var ys : MutableList<Any?>? = LinkedList<Any?>()
+for (x : Any? in xs!!)
+{
+ys?.add(x)
+}
+for (y : Any? in ys!!)
+{
+xs?.add(y)
+}
+}
+}

j2k/tests/testData/ast/list/file/Lists.jav

@@ -0,0 +1,14 @@
+import java.util.*;
+
+public class Lists {
+    public void test() {
+        List<Object> xs = new ArrayList<Object>();
+        List<Object> ys = new LinkedList<Object>();
+        ArrayList<Object> zs = new ArrayList<Object>();
+        xs.add(null);
+        ys.add(null);
+        xs.clear();
+        ys.clear();
+        zs.add(null);
+    }
+}

j2k/tests/testData/ast/list/file/Lists.kt

@@ -0,0 +1,13 @@
+import java.util.*
+public open class Lists() {
+public open fun test() : Unit {
+var xs : MutableList<Any?>? = ArrayList<Any?>()
+var ys : MutableList<Any?>? = LinkedList<Any?>()
+var zs : ArrayList<Any?>? = ArrayList<Any?>()
+xs?.add(null)
+ys?.add(null)
+xs?.clear()
+ys?.clear()
+zs?.add(null)
+}
+}

j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt

@@ -1,7 +1,6 @@
 package test
-import java.util.List
 open class User() {
 open fun main() : Unit {
-var list : List<Any?>? = java.util.LinkedList()
+var list : MutableList<*>? = java.util.LinkedList()
 }
 }

j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt

@@ -1,6 +1,6 @@
 package test
 open class User() {
 open fun main() : Unit {
-var list : java.util.List<Any?>? = java.util.LinkedList()
+var list : MutableList<*>? = java.util.LinkedList()
 }
 }

j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt

@@ -1,7 +1,6 @@
-import java.util.List
 import java.util.LinkedList
 open class User() {
 open fun main() : Unit {
-var list : List<String?>? = LinkedList<String?>()
+var list : MutableList<String?>? = LinkedList<String?>()
 }
 }

j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt

@@ -1,11 +1,10 @@
 package org.test
-import java.util.List
 import java.util.LinkedList
 open class Member() {
 }
 open class User() {
 open fun main() : Unit {
-var members : List<Member?>? = LinkedList<Member?>()
+var members : MutableList<Member?>? = LinkedList<Member?>()
 members?.add(Member())
 }
 }

j2k/tests/testData/ast/prefixOperator/statement/nullableIf.jav

@@ -0,0 +1,2 @@
+String s = null;
+if (!s.isEmpty()) { }

j2k/tests/testData/ast/prefixOperator/statement/nullableIf.kt

@@ -0,0 +1,4 @@
+var s : String? = null
+if (!s?.isEmpty()!!)
+{
+}

j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt

@@ -6,8 +6,8 @@ System.out?.println(e)
 }
 open class Test() {
 open fun main() : Unit {
-var raw1 : Collection<Any?>? = Collection(1)
-var raw2 : Collection<Any?>? = Collection<Int?>(1)
-var raw3 : Collection<Any?>? = Collection<String?>("1")
+var raw1 : Collection<*>? = Collection(1)
+var raw2 : Collection<*>? = Collection<Int?>(1)
+var raw3 : Collection<*>? = Collection<String?>("1")
 }
 }

j2k/tests/testData/ast/rawGenerics/file/kt-540.kt

@@ -1,10 +1,9 @@
 package demo
-import java.util.List
 import java.util.LinkedList
 open class Test() {
 open fun main() : Unit {
-var common : List<String?>? = LinkedList<String?>()
-var raw : List<Any?>? = LinkedList<String?>()
-var superRaw : List<Any?>? = LinkedList()
+var common : MutableList<String?>? = LinkedList<String?>()
+var raw : MutableList<*>? = LinkedList<String?>()
+var superRaw : MutableList<*>? = LinkedList()
 }
 }

j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt

@@ -85,4 +85,4 @@ for (i in 1..12) test(i)
 }
 }
 }
-fun main(args : Array<String?>?) = SwitchDemo.main(args)
+fun main(args : Array<String>) = SwitchDemo.main(args as Array<String?>?)

j2k/tests/testData/ast/switch/file/emptySwitch.jav

@@ -0,0 +1,10 @@
+public class NonDefault {
+    public static void main(String[] args) {
+
+        int value = 3;
+        String valueString = "";
+        switch (value) {
+        }
+        System.out.println(valueString);
+    }
+}

j2k/tests/testData/ast/switch/file/emptySwitch.kt

@@ -0,0 +1,14 @@
+public open class NonDefault() {
+class object {
+public open fun main(args : Array<String?>?) : Unit {
+var value : Int = 3
+var valueString : String? = ""
+when (value) {
+else -> {
+}
+}
+System.out?.println(valueString)
+}
+}
+}
+fun main(args : Array<String>) = NonDefault.main(args as Array<String?>?)

j2k/tests/testData/ast/switch/file/fallDown.kt

@@ -16,4 +16,4 @@ System.out?.println(monthString)
 }
 }
 }
-fun main(args : Array<String?>?) = SwitchDemo.main(args)
+fun main(args : Array<String>) = SwitchDemo.main(args as Array<String?>?)

j2k/tests/testData/ast/switch/file/kt-539.kt

@@ -49,4 +49,4 @@ System.out?.println(monthString)
 }
 }
 }
-fun main(args : Array<String?>?) = SwitchDemo.main(args)
+fun main(args : Array<String>) = SwitchDemo.main(args as Array<String?>?)

j2k/tests/testData/ast/switch/file/nondefault.jav

@@ -0,0 +1,13 @@
+public class NonDefault {
+    public static void main(String[] args) {
+
+        int value = 3;
+        String valueString = "";
+        switch (value) {
+            case 1:  valueString = "ONE";      break;
+            case 2:  valueString = "TWO";      break;
+            case 3:  valueString = "THREE";    break;
+        }
+        System.out.println(valueString);
+    }
+}

j2k/tests/testData/ast/switch/file/nondefault.kt

@@ -0,0 +1,23 @@
+public open class NonDefault() {
+class object {
+public open fun main(args : Array<String?>?) : Unit {
+var value : Int = 3
+var valueString : String? = ""
+when (value) {
+1 -> {
+valueString = "ONE"
+}
+2 -> {
+valueString = "TWO"
+}
+3 -> {
+valueString = "THREE"
+}
+else -> {
+}
+}
+System.out?.println(valueString)
+}
+}
+}
+fun main(args : Array<String>) = NonDefault.main(args as Array<String?>?)

j2k/tests/testData/ast/trait/class/interfaceWithFields.kt

@@ -1,7 +1,7 @@
 trait INode {
 class object {
-val IN : String? = "in"
-val AT : String? = "@"
+val IN : String = "in"
+val AT : String = "@"
 val COMMA_WITH_SPACE : String? = COMMA + SPACE
 }
 }

j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.kt

@@ -1,7 +1,7 @@
 public trait INode {
 class object {
-public val IN : String? = "in"
-public val AT : String? = "@"
+public val IN : String = "in"
+public val AT : String = "@"
 public val COMMA_WITH_SPACE : String? = COMMA + SPACE
 }
 }

j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt

@@ -2,10 +2,10 @@ try
 {
 callMethod(params)
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
 finally

j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt

@@ -1,10 +1,10 @@
 try
 {
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
 finally

j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt

@@ -1,10 +1,10 @@
 try
 {
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
 finally

j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt

@@ -1,9 +1,9 @@
 try
 {
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }

j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.kt

@@ -1 +1 @@
-(100.00 as Int)
+100.00.toInt()