Merge remote-tracking branch 'origin/master' into incremental

2014-06-19 11:43:11 +04:00
parent f6129732a2 209315baad
commit aa41ae09ed
89 changed files with 1305 additions and 808 deletions
@@ -0,0 +1,30 @@
+package test;
+
+public class PrivateMembers {
+    private PrivateMembers() {
+    }
+
+    private int field = 1;
+    private static int staticField = 2;
+
+    private void method() {
+    }
+
+    private void samAdapter(SamInterface r) {
+    }
+
+    private static void staticMethod() {
+    }
+
+    private class Inner {
+    }
+
+    private interface SamInterface {
+        void foo();
+    }
+
+    private static class Nested {
+        private static void staticMethodInNested() {
+        }
+    }
+}
@@ -0,0 +1,31 @@
+package test
+
+public open class PrivateMembers : java.lang.Object {
+    private constructor PrivateMembers()
+    private final var field: kotlin.Int
+    private open fun method(): kotlin.Unit
+    private final /*synthesized*/ fun samAdapter(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
+    private open fun samAdapter(/*0*/ p0: test.PrivateMembers.SamInterface?): kotlin.Unit
+
+    private open inner class Inner : java.lang.Object {
+        private constructor Inner()
+    }
+
+    private open class Nested : java.lang.Object {
+        private constructor Nested()
+    }
+
+    private trait SamInterface : java.lang.Object {
+        public abstract fun foo(): kotlin.Unit
+    }
+}
+
+package test.PrivateMembers {
+    private var staticField: kotlin.Int
+    private /*synthesized*/ fun SamInterface(/*0*/ function: () -> kotlin.Unit): test.PrivateMembers.SamInterface
+    private open fun staticMethod(): kotlin.Unit
+
+    package test.PrivateMembers.Nested {
+        private open fun staticMethodInNested(): kotlin.Unit
+    }
+}
@@ -0,0 +1,19 @@
+package test;
+
+public class PrivateMembersInHierarchy {
+    public static class Super {
+        private int field = 1;
+        private int field2 = 1;
+
+        private void method() {
+        }
+    }
+
+    public static class Sub extends Super {
+        private int field = 1;
+
+        private void method() {
+        }
+    }
+}
+
@@ -0,0 +1,19 @@
+package test
+
+public open class PrivateMembersInHierarchy : java.lang.Object {
+    public constructor PrivateMembersInHierarchy()
+
+    public open class Sub : test.PrivateMembersInHierarchy.Super {
+        public constructor Sub()
+        private final var field: kotlin.Int
+        invisible_fake final override /*1*/ /*fake_override*/ var field2: kotlin.Int
+        private open fun method(): kotlin.Unit
+    }
+
+    public open class Super : java.lang.Object {
+        public constructor Super()
+        private final var field: kotlin.Int
+        private final var field2: kotlin.Int
+        private open fun method(): kotlin.Unit
+    }
+}