Merge remote-tracking branch 'origin/master'

compiler/testData/readJavaBinaryClass/FieldAsVar.java

@@ -0,0 +1,5 @@
+package test;
+
+final class FieldAsVar {
+    public int f;
+}

compiler/testData/readJavaBinaryClass/FieldAsVar.kt

@@ -0,0 +1,5 @@
+package test
+
+class FieldAsVar() {
+    var f: Int = 1
+}

compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java

@@ -0,0 +1,5 @@
+package test;
+
+final class FinalFieldAsVal {
+    public final int f = 1;
+}

compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt

@@ -0,0 +1,5 @@
+package test
+
+class FinalFieldAsVal() {
+    val f: Int = 1
+}

compiler/testData/readJavaBinaryClass/Simple.java

@@ -0,0 +1,5 @@
+package test;
+
+public final class Simple {
+    public Simple() { }
+}

compiler/testData/readJavaBinaryClass/Simple.kt

@@ -0,0 +1,3 @@
+package test
+
+class Simple()

compiler/testData/readJavaBinaryClass/TwoFields.java

@@ -0,0 +1,6 @@
+package test;
+
+final class TwoFields {
+    int a;
+    short b;
+}

compiler/testData/readJavaBinaryClass/TwoFields.kt

@@ -0,0 +1,6 @@
+package test
+
+class TwoFields() {
+    var a: Int = 1
+    var b: Short = 2;
+}

compiler/testData/readKotlinBinaryClass/prop/CollectionSize.kt

@@ -0,0 +1,6 @@
+package test
+
+import java.util.Collection
+
+val Collection<*>.anotherSize : Int
+    get() = size()

compiler/testData/readKotlinBinaryClass/prop/ExtVarl.kt

@@ -0,0 +1,8 @@
+package test
+
+var Int.junk: Short
+    get() = throw Exception()
+    set(p: Short) = throw Exception()
+
+val String.junk: Int
+    get() = throw Exception()

compiler/testData/readKotlinBinaryClass/type/Any.kt

@@ -0,0 +1,3 @@
+package test
+
+fun any(): Any = 1

compiler/testData/readKotlinBinaryClass/type/AnyQ.kt

@@ -0,0 +1,3 @@
+package test
+
+fun anyq(): Any? = 1

compiler/testData/readKotlinBinaryClass/type/Function1IntString.kt

@@ -0,0 +1,3 @@
+package test
+
+fun fun1(): (String) -> Int = throw Exception()

compiler/testData/readKotlinBinaryClass/type/ListOfAny.kt

@@ -0,0 +1,5 @@
+package test
+
+import java.util.List
+
+fun listOfAny(): List<Any> = throw Exception()

compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.kt

@@ -0,0 +1,5 @@
+package test
+
+import java.util.List
+
+fun listOfAnyQ(): List<Any?> = throw Exception()

compiler/testData/readKotlinBinaryClass/type/ListOfStar.kt

@@ -0,0 +1,5 @@
+package test
+
+import java.util.List
+
+fun listOfStar(): List<*> = throw Exception()

compiler/testData/writeSignature/ListOfStar.kt

@@ -0,0 +1,8 @@
+import java.util.List
+
+fun listOfStar(): List<*> = throw Exception()
+
+// method: namespace::listOfStar
+// jvm signature:     ()Ljava/util/List;
+// generic signature: ()Ljava/util/List<+Ljava/lang/Object;>;
+// kotlin signature:  ()Ljava/util/List<+?Ljava/lang/Object;>;