Regenerated all test data which uses NamespaceComparator.

2012-12-26 19:01:00 +04:00
parent af3dffbed4
commit 5dec5a4c28
335 changed files with 3084 additions and 2792 deletions
@@ -1,16 +1,19 @@
 namespace test
-public open class test.DeeplyInnerClass : java.lang.Object {
+public open class DeeplyInnerClass : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.DeeplyInnerClass
+    public constructor DeeplyInnerClass()
-    package open class test.DeeplyInnerClass.A : java.lang.Object {
+    
-        package final /*constructor*/ fun <init>(): test.DeeplyInnerClass.A
+    public/*package*/ open class A : java.lang.Object {
-        package open fun a(): jet.Tuple0
+        public/*package*/ constructor A()
-        package open class test.DeeplyInnerClass.A.B : java.lang.Object {
+        public/*package*/ open fun a() : Unit
-            package final /*constructor*/ fun <init>(): test.DeeplyInnerClass.A.B
+        
-            package open fun b(): jet.Tuple0
+        public/*package*/ open class B : java.lang.Object {
-            package open class test.DeeplyInnerClass.A.B.C : java.lang.Object {
+            public/*package*/ constructor B()
-                package final /*constructor*/ fun <init>(): test.DeeplyInnerClass.A.B.C
+            public/*package*/ open fun b() : Unit
-                package open fun c(): jet.Tuple0
+            
            public/*package*/ open class C : java.lang.Object {
                public/*package*/ constructor C()
                public/*package*/ open fun c() : Unit
            }
        }
    }
@@ -1,2 +1 @@
 namespace DeeplyInnerClass
@@ -1,23 +1,26 @@
 namespace test
-public final enum class test.Enum : jet.Enum<test.Enum> {
+public final enum class Enum : jet.Enum<test.Enum> {
-    private final /*constructor*/ fun <init>(): test.Enum
+    private constructor Enum()
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
-    public open class test.Enum.Inner : java.lang.Object {
+    
-        public final /*constructor*/ fun <init>(): test.Enum.Inner
+    public class object <class-object-for-Enum> {
-        package open fun bar(): jet.Tuple0
+        private constructor <class-object-for-Enum>()
-    }
+        public final val A : test.Enum
-    public final class object test.Enum.<class-object-for-Enum> {
+        public final val B : test.Enum
-        private final /*constructor*/ fun <init>(): test.Enum.<class-object-for-Enum>
+        public final val C : test.Enum
-        public final val A: test.Enum
+        public final fun valueOf(/*0*/ value : jet.String) : test.Enum
-        public final val B: test.Enum
+        public final fun values() : jet.Array<test.Enum>
-        public final val C: test.Enum
+        
-        public open class test.Enum.Nested : java.lang.Object {
+        public open class Nested : java.lang.Object {
-            public final /*constructor*/ fun <init>(): test.Enum.Nested
+            public constructor Nested()
-            package open fun foo(): jet.Tuple0
+            public/*package*/ open fun foo() : Unit
        }
-        public final fun valueOf(/*0*/ value: jet.String): test.Enum
+    }
-        public final fun values(): jet.Array<test.Enum>
+    
    public open class Inner : java.lang.Object {
        public constructor Inner()
        public/*package*/ open fun bar() : Unit
    }
 }
@@ -1,9 +1,10 @@
 namespace test
-public open class test.InnerClass : java.lang.Object {
+public open class InnerClass : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.InnerClass
+    public constructor InnerClass()
-    public open class test.InnerClass.Inner : java.lang.Object {
+    
-        public final /*constructor*/ fun <init>(): test.InnerClass.Inner
+    public open class Inner : java.lang.Object {
-        public open fun foo(): jet.Tuple0
+        public constructor Inner()
        public open fun foo() : Unit
    }
 }
@@ -1,6 +1,6 @@
 namespace InnerClass
-public open class test.InnerClass.Nested : java.lang.Object {
+public open class Nested : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.InnerClass.Nested
+    public constructor Nested()
-    public open fun bar(): jet.Tuple0
+    public open fun bar() : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.Simple : java.lang.Object {
+public open class Simple : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.Simple
+    public constructor Simple()
-    public open fun foo(): jet.Tuple0
+    public open fun foo() : Unit
 }
@@ -1,3 +1,2 @@
 namespace Simple
-
+public open fun bar() : Unit
 public open fun bar(): jet.Tuple0
@@ -1,12 +1,14 @@
 namespace test
-internal final class test.B : jet.Any {
+internal final class B {
-    public final /*primary constructor*/ fun <init>(): test.B
+    /*primary*/ public constructor B()
-    internal final class test.B.B : jet.Any {
+    
-        public final /*primary constructor*/ fun <init>(): test.B.B
+    internal final class B {
-        internal final fun foo(/*0*/ b: test.B.B.C): jet.Tuple0
+        /*primary*/ public constructor B()
-        internal final class test.B.B.C : jet.Any {
+        internal final fun foo(/*0*/ b : test.B.B.C) : Unit
-            public final /*primary constructor*/ fun <init>(): test.B.B.C
+        
        internal final class C {
            /*primary*/ public constructor C()
        }
    }
 }
@@ -1,10 +1,11 @@
 namespace test
-internal open class test.A : jet.Any {
+internal open class A {
-    public final /*primary constructor*/ fun <init>(): test.A
+    /*primary*/ public constructor A()
-    internal open fun foo(/*0*/ a: [ERROR : E]): jet.Tuple0
+    internal open fun foo(/*0*/ a : [ERROR : E]) : Unit
 }
-internal final class test.B : test.A {
+
-    public final /*primary constructor*/ fun <init>(): test.B
+internal final class B : test.A {
-    internal open override /*1*/ fun foo(/*0*/ a: [ERROR : E]): jet.Tuple0
+    /*primary*/ public constructor B()
    internal open override /*1*/ fun foo(/*0*/ a : [ERROR : E]) : Unit
 }
@@ -1,11 +1,13 @@
 namespace test
-internal final class test.Some : jet.Any {
+internal final class Some {
-    public final /*primary constructor*/ fun <init>(): test.Some
+    /*primary*/ public constructor Some()
-    [ERROR : Unresolved annotation type]() internal final class object test.Some.<class-object-for-Some> : jet.Any {
+    
-        private final /*constructor*/ fun <init>(): test.Some.<class-object-for-Some>
+    [ERROR : Unresolved annotation type]() internal class object <class-object-for-Some> {
-        internal final annotation class test.Some.<class-object-for-Some>.TestAnnotation : jet.Annotation {
+        /*primary*/ private constructor <class-object-for-Some>()
-            public final /*constructor*/ fun <init>(): test.Some.<class-object-for-Some>.TestAnnotation
+        
        internal final annotation class TestAnnotation : jet.Annotation {
            /*primary*/ public constructor TestAnnotation()
        }
    }
 }
@@ -1,12 +1,14 @@
 namespace test
-internal final class test.TestSome</*0*/ P : jet.Any?> : jet.Any {
+internal final class TestSome</*0*/ P> {
-    public final /*primary constructor*/ fun </*0*/ P : jet.Any?><init>(): test.TestSome<P>
+    /*primary*/ public constructor TestSome</*0*/ P>()
-    internal final class object test.TestSome.<class-object-for-TestSome> : test.ToResolve<[ERROR : P]> {
+    
-        private final /*constructor*/ fun <init>(): test.TestSome.<class-object-for-TestSome>
+    internal class object <class-object-for-TestSome> : test.ToResolve<[ERROR : P]> {
        /*primary*/ private constructor <class-object-for-TestSome>()
    }
 }
-internal open class test.ToResolve</*0*/ SomeClass : jet.Any?> : jet.Any {
+
-    public final /*primary constructor*/ fun </*0*/ SomeClass : jet.Any?><init>(/*0*/ f: jet.Function1<jet.Int, jet.Int>): test.ToResolve<SomeClass>
+internal open class ToResolve</*0*/ SomeClass> {
    /*primary*/ public constructor ToResolve</*0*/ SomeClass>(/*0*/ f : (jet.Int) -> jet.Int)
 }
-internal final fun testFun(/*0*/ a: jet.Int): jet.Int
+internal final fun testFun(/*0*/ a : jet.Int) : jet.Int
@@ -1,24 +1,27 @@
 namespace test
-internal final enum class test.Test : jet.Enum<test.Test> {
+internal final enum class Test : jet.Enum<test.Test> {
-    private final /*primary constructor*/ fun <init>(/*0*/ a: jet.Int): test.Test
+    /*primary*/ private constructor Test(/*0*/ a : jet.Int)
-    public final override /*1*/ /*fake_override*/ fun name(): jet.String
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
-    internal final class object test.Test.<class-object-for-Test> {
+    
-        private final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>
+    internal class object <class-object-for-Test> {
-        public final val A: test.Test
+        /*primary*/ private constructor <class-object-for-Test>()
-        public final val B: test.Test
+        public final val A : test.Test
-        private final enum entry test.Test.<class-object-for-Test>.A : test.Test {
+        public final val B : test.Test
-            private final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>.A
+        public final fun valueOf(/*0*/ value : jet.String) : test.Test
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
+        public final fun values() : jet.Array<test.Test>
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+        
        private enum entry A : test.Test {
            /*primary*/ private constructor A()
            public final override /*1*/ /*fake_override*/ fun name() : jet.String
            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
        }
-        private final enum entry test.Test.<class-object-for-Test>.B : test.Test {
+        
-            private final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>.B
+        private enum entry B : test.Test {
-            public final override /*1*/ /*fake_override*/ fun name(): jet.String
+            /*primary*/ private constructor B()
-            public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
+            public final override /*1*/ /*fake_override*/ fun name() : jet.String
            public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
        }
        public final fun valueOf(/*0*/ value: jet.String): test.Test
        public final fun values(): jet.Array<test.Test>
    }
 }
@@ -1,4 +1,3 @@
 namespace test
-
+internal final val fromImported : jet.Int
-internal final val fromImported: jet.Int
+internal final val normal : jet.Int
 internal final val normal: jet.Int
@@ -1,3 +1,2 @@
 namespace test
-
+internal final fun </*0*/ T> foo(/*0*/ t : T) : T
 internal final fun </*0*/ T : jet.Any?>foo(/*0*/ t: T): T
@@ -1,10 +1,11 @@
 namespace test
-internal final class test.A : jet.Any {
+internal final class A {
-    public final /*primary constructor*/ fun <init>(): test.A
+    /*primary*/ public constructor A()
-    internal final val B: test.A.B
+    internal final val B : test.A.B
-    internal final object test.A.B : jet.Any {
+    
-        private final /*primary constructor*/ fun <init>(): test.A.B
+    internal object B {
-        internal final fun foo(/*0*/ a: jet.Int): jet.String
+        /*primary*/ private constructor B()
        internal final fun foo(/*0*/ a : jet.Int) : jet.String
    }
 }
@@ -1,7 +1,7 @@
 namespace test
-internal final object test.SomeObject : jet.Any {
+internal object SomeObject {
-    private final /*primary constructor*/ fun <init>(): test.SomeObject
+    /*primary*/ private constructor SomeObject()
-    internal final fun test(/*0*/ a: jet.Int): jet.Int
+    internal final fun test(/*0*/ a : jet.Int) : jet.Int
 }
-internal final val SomeObject: test.SomeObject
+internal final val SomeObject : test.SomeObject
@@ -1,6 +1,6 @@
 namespace test
-internal final object test.Bar : jet.Any {
+internal object Bar {
-    private final /*primary constructor*/ fun <init>(): test.Bar
+    /*primary*/ private constructor Bar()
 }
-internal final val Bar: test.Bar
+internal final val Bar : test.Bar
@@ -1,26 +1,28 @@
 namespace test
 // <namespace name="p">
 namespace p
-internal final class test.p.C : jet.Any {
+internal final class C {
-    public final /*primary constructor*/ fun <init>(): test.p.C
+    /*primary*/ public constructor C()
-    internal final fun f(): jet.Tuple0
+    internal final fun f() : Unit
 }
-internal open class test.p.G</*0*/ T : jet.Any?> : jet.Any {
+
-    public final /*primary constructor*/ fun </*0*/ T : jet.Any?><init>(): test.p.G<T>
+internal open class G</*0*/ T> {
-    internal final fun a(): jet.Tuple0
+    /*primary*/ public constructor G</*0*/ T>()
-    internal open fun f(): T
+    internal final fun a() : Unit
    internal open fun f() : T
 }
-internal final class test.p.G2</*0*/ E : jet.Any?> : test.p.G<E> {
+
-    public final /*primary constructor*/ fun </*0*/ E : jet.Any?><init>(): test.p.G2<E>
+internal final class G2</*0*/ E> : test.p.G<E> {
-    internal final override /*1*/ /*fake_override*/ fun a(): jet.Tuple0
+    /*primary*/ public constructor G2</*0*/ E>()
-    internal open override /*1*/ fun f(): E
+    internal final override /*1*/ /*fake_override*/ fun a() : Unit
-    internal final fun g(): E
+    internal open override /*1*/ fun f() : E
    internal final fun g() : E
 }
-internal final fun foo(): jet.Tuple0
+internal final fun foo() : Unit
-internal final fun foo(/*0*/ a: test.p.C): jet.Tuple0
+internal final fun foo(/*0*/ a : test.p.C) : Unit
 // </namespace name="p">
-internal final class test.A : jet.Any {
+
-    public final /*primary constructor*/ fun <init>(): test.A
+internal final class A {
    /*primary*/ public constructor A()
 }
@@ -1,6 +1,6 @@
 namespace test
-internal final class test.CompositeIterator</*0*/ T : jet.Any?> : jet.Any {
+internal final class CompositeIterator</*0*/ T> {
-    public final /*primary constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ vararg iterators: java.util.Iterator<T> /*jet.Array<java.util.Iterator<T>>*/): test.CompositeIterator<T>
+    /*primary*/ public constructor CompositeIterator</*0*/ T>(/*0*/ vararg iterators : java.util.Iterator<T> /*jet.Array<java.util.Iterator<T>>*/)
-    internal final val iteratorsIter: jet.Iterator<java.util.Iterator<T>>
+    internal final val iteratorsIter : jet.Iterator<java.util.Iterator<T>>
 }
@@ -1,6 +1,6 @@
 namespace test
-public final class test.ArrayTypeVariance : java.lang.Object {
+public final class ArrayTypeVariance : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ArrayTypeVariance
+    public constructor ArrayTypeVariance()
-    public final fun toArray(/*0*/ p0: jet.Array<out jet.Any>?): jet.Array<jet.Any>?
+    public final fun toArray(/*0*/ p0 : jet.Array<out jet.Any>?) : jet.Array<jet.Any>?
 }
@@ -1,26 +1,26 @@
 namespace test
-public abstract class test.ClassDoesNotOverrideMethod : java.util.Date {
+public abstract class ClassDoesNotOverrideMethod : java.util.Date {
-    public final /*constructor*/ fun <init>(): test.ClassDoesNotOverrideMethod
+    public constructor ClassDoesNotOverrideMethod()
-    public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date): jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0 : java.util.Date) : jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date): jet.Boolean
+    public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0 : java.util.Date) : jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0: java.util.Date): jet.Int
+    public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0 : java.util.Date) : jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getDate(): jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDate() : jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getDay(): jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDay() : jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getHours(): jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getHours() : jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getMinutes(): jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMinutes() : jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getMonth(): jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMonth() : jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getSeconds(): jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getSeconds() : jet.Int
-    public open override /*1*/ /*fake_override*/ fun getTime(): jet.Long
+    public open override /*1*/ /*fake_override*/ fun getTime() : jet.Long
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getTimezoneOffset(): jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset() : jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getYear(): jet.Int
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear() : jet.Int
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: jet.Int): jet.Tuple0
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0 : jet.Int) : Unit
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: jet.Int): jet.Tuple0
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0 : jet.Int) : Unit
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: jet.Int): jet.Tuple0
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0 : jet.Int) : Unit
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: jet.Int): jet.Tuple0
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0 : jet.Int) : Unit
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: jet.Int): jet.Tuple0
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0 : jet.Int) : Unit
-    public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: jet.Long): jet.Tuple0
+    public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0 : jet.Long) : Unit
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: jet.Int): jet.Tuple0
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0 : jet.Int) : Unit
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun toGMTString(): jet.String
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString() : jet.String
-    public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun toLocaleString(): jet.String
+    jet.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString() : jet.String
 }
@@ -1,5 +1,5 @@
 namespace test
-public final class test.ClassWithTypeP</*0*/ P : jet.Any?> : java.lang.Object {
+public final class ClassWithTypeP</*0*/ P> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypeP<P>
+    public constructor ClassWithTypeP</*0*/ P>()
 }
@@ -1,6 +1,6 @@
 namespace test
-public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : jet.MutableIterable<P> {
+public abstract class ClassWithTypePExtendsIterableP</*0*/ P> : jet.MutableIterable<P> {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypePExtendsIterableP<P>
+    public constructor ClassWithTypePExtendsIterableP</*0*/ P>()
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): jet.MutableIterator<P>
+    public abstract override /*1*/ /*fake_override*/ fun iterator() : jet.MutableIterator<P>
 }
@@ -1,5 +1,5 @@
 namespace test
-public final class test.ClassWithTypePP</*0*/ P : jet.Any?, /*1*/ Q : P> : java.lang.Object {
+public final class ClassWithTypePP</*0*/ P, /*1*/ Q : P> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : P><init>(): test.ClassWithTypePP<P, Q>
+    public constructor ClassWithTypePP</*0*/ P, /*1*/ Q : P>()
 }
@@ -1,5 +1,5 @@
 namespace test
-public open class test.ClassWithTypePRefNext</*0*/ R : jet.Iterable<P>?, /*1*/ P : jet.Any?> : java.lang.Object {
+public open class ClassWithTypePRefNext</*0*/ R : jet.Iterable<P>?, /*1*/ P> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ R : jet.Iterable<P>?, /*1*/ P : jet.Any?><init>(): test.ClassWithTypePRefNext<R, P>
+    public constructor ClassWithTypePRefNext</*0*/ R : jet.Iterable<P>?, /*1*/ P>()
 }
@@ -1,5 +1,5 @@
 namespace test
-public final class test.ClassWithTypePRefSelf</*0*/ P : jet.Enum<P>?> : java.lang.Object {
+public final class ClassWithTypePRefSelf</*0*/ P : jet.Enum<P>?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Enum<P>?><init>(): test.ClassWithTypePRefSelf<P>
+    public constructor ClassWithTypePRefSelf</*0*/ P : jet.Enum<P>?>()
 }
@@ -1,6 +1,6 @@
 namespace test
-public final class test.FieldAsVar : java.lang.Object {
+public final class FieldAsVar : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.FieldAsVar
+    public constructor FieldAsVar()
-    public final var f: jet.Int
+    public final var f : jet.Int
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.FieldOfArrayType : java.lang.Object {
+public open class FieldOfArrayType : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.FieldOfArrayType
+    public constructor FieldOfArrayType()
-    public final var files: jet.Array<java.io.File>?
+    public final var files : jet.Array<java.io.File>?
 }
@@ -1,6 +1,6 @@
 namespace test
-public final class test.FinalFieldAsVal : java.lang.Object {
+public final class FinalFieldAsVal : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.FinalFieldAsVal
+    public constructor FinalFieldAsVal()
-    public final val f: jet.Int
+    public final val f : jet.Int
 }
@@ -1,8 +1,9 @@
 namespace test
-public open class test.InnerClass : java.lang.Object {
+public open class InnerClass : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.InnerClass
+    public constructor InnerClass()
-    public open class test.InnerClass.Inner : java.lang.Object {
+    
-        public final /*constructor*/ fun <init>(): test.InnerClass.Inner
+    public open class Inner : java.lang.Object {
        public constructor Inner()
    }
 }
@@ -1,8 +1,9 @@
 namespace test
-public open class test.InnerClassReferencesOuterTP</*0*/ P : jet.Any?> : java.lang.Object {
+public open class InnerClassReferencesOuterTP</*0*/ P> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.InnerClassReferencesOuterTP<P>
+    public constructor InnerClassReferencesOuterTP</*0*/ P>()
-    public open class test.InnerClassReferencesOuterTP.Inner</*0*/ Q : P> : java.lang.Object {
+    
-        public final /*constructor*/ fun </*0*/ Q : P><init>(): test.InnerClassReferencesOuterTP.Inner<Q>
+    public open class Inner</*0*/ Q : P> : java.lang.Object {
        public constructor Inner</*0*/ Q : P>()
    }
 }
@@ -1,12 +1,14 @@
 namespace test
-public open class test.InnerClassesInGeneric</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : java.lang.Object {
+public open class InnerClassesInGeneric</*0*/ P, /*1*/ Q> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.InnerClassesInGeneric<P, Q>
+    public constructor InnerClassesInGeneric</*0*/ P, /*1*/ Q>()
-    public open class test.InnerClassesInGeneric.Inner : java.lang.Object {
+    
-        public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner
+    public open class Inner : java.lang.Object {
        public constructor Inner()
    }
-    public open class test.InnerClassesInGeneric.Inner2 : test.InnerClassesInGeneric.Inner {
+    
-        public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner2
+    public open class Inner2 : test.InnerClassesInGeneric.Inner {
-        public open fun iterator(): jet.MutableIterator<P>?
+        public constructor Inner2()
        public open fun iterator() : jet.MutableIterator<P>?
    }
 }
@@ -1,9 +1,10 @@
 namespace test
-public final class test.MethodReferencesOuterClassTP</*0*/ P : jet.Any?> : java.lang.Object {
+public final class MethodReferencesOuterClassTP</*0*/ P> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodReferencesOuterClassTP<P>
+    public constructor MethodReferencesOuterClassTP</*0*/ P>()
-    public final class test.MethodReferencesOuterClassTP.Inner : java.lang.Object {
+    
-        public final /*constructor*/ fun <init>(): test.MethodReferencesOuterClassTP.Inner
+    public final class Inner : java.lang.Object {
-        public final fun </*0*/ Q : P>f(): jet.Tuple0
+        public constructor Inner()
        public final fun </*0*/ Q : P> f() : Unit
    }
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.MethodTypePOneUpperBound : java.lang.Object {
+public open class MethodTypePOneUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodTypePOneUpperBound
+    public constructor MethodTypePOneUpperBound()
-    public open fun </*0*/ T : java.lang.Cloneable?>bar(): jet.Tuple0
+    public open fun </*0*/ T : java.lang.Cloneable?> bar() : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.MethodTypePTwoUpperBounds : java.lang.Object {
+public open class MethodTypePTwoUpperBounds : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodTypePTwoUpperBounds
+    public constructor MethodTypePTwoUpperBounds()
-    public open fun </*0*/ T : java.lang.Cloneable? & java.lang.Runnable?>foo(): jet.Tuple0
+    public open fun </*0*/ T> foo() : Unit where T : java.lang.Cloneable?, T : java.lang.Runnable?
 }
@@ -1,6 +1,6 @@
 namespace test
-public final class test.MethodWithTypeP : java.lang.Object {
+public final class MethodWithTypeP : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithTypeP
+    public constructor MethodWithTypeP()
-    public final fun </*0*/ P : jet.Any?>f(): jet.Tuple0
+    public final fun </*0*/ P> f() : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public final class test.MethodWithTypePP : java.lang.Object {
+public final class MethodWithTypePP : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithTypePP
+    public constructor MethodWithTypePP()
-    public final fun </*0*/ P : jet.Any?, /*1*/ Q : P>f(): jet.Tuple0
+    public final fun </*0*/ P, /*1*/ Q : P> f() : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.MethodWithTypePRefClassP</*0*/ P : jet.Any?> : java.lang.Object {
+public open class MethodWithTypePRefClassP</*0*/ P> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodWithTypePRefClassP<P>
+    public constructor MethodWithTypePRefClassP</*0*/ P>()
-    public final fun </*0*/ Q : P>f(): jet.Tuple0
+    public final fun </*0*/ Q : P> f() : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public final class test.MethosWithPRefTP : java.lang.Object {
+public final class MethosWithPRefTP : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethosWithPRefTP
+    public constructor MethosWithPRefTP()
-    public final fun </*0*/ P : jet.Any?>f(/*0*/ p0: P?): jet.Tuple0
+    public final fun </*0*/ P> f(/*0*/ p0 : P?) : Unit
 }
@@ -1,5 +1,5 @@
 namespace test
-public open class test.MyException : java.lang.Object {
+public open class MyException : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Throwable?): test.MyException
+    public constructor MyException(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.Throwable?)
 }
@@ -1,6 +1,6 @@
 namespace test
-public abstract trait test.RemoveRedundantProjectionKind : java.lang.Object {
+public trait RemoveRedundantProjectionKind : java.lang.Object {
-    public abstract fun f(/*0*/ p0: jet.Collection<jet.CharSequence?>?): jet.Tuple0
+    public abstract fun f(/*0*/ p0 : jet.Collection<jet.CharSequence?>?) : Unit
-    public abstract fun f(/*0*/ p0: jet.Comparable<jet.CharSequence?>?): jet.Tuple0
+    public abstract fun f(/*0*/ p0 : jet.Comparable<jet.CharSequence?>?) : Unit
 }
@@ -1,5 +1,5 @@
 namespace test
-public final class test.Simple : java.lang.Object {
+public final class Simple : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.Simple
+    public constructor Simple()
 }
@@ -1,7 +1,7 @@
 namespace test
-public final class test.TwoFields : java.lang.Object {
+public final class TwoFields : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.TwoFields
+    public constructor TwoFields()
-    public final var a: jet.Int
+    public final var a : jet.Int
-    public final var b: jet.Short
+    public final var b : jet.Short
 }
@@ -1,8 +1,9 @@
 namespace test
-public final class test.UnboundWildcard : java.lang.Object {
+public final class UnboundWildcard : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.UnboundWildcard
+    public constructor UnboundWildcard()
-    public final fun foo(): test.UnboundWildcard.MyClass<out jet.CharSequence?>?
+    public final fun foo() : test.UnboundWildcard.MyClass<out jet.CharSequence?>?
-    public abstract trait test.UnboundWildcard.MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
+    
    public trait MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
    }
 }
@@ -1,5 +1,5 @@
 namespace test
-test.AnnotatedAnnotation() public final annotation class test.AnnotatedAnnotation : jet.Annotation {
+test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : jet.Annotation {
-    public final /*constructor*/ fun <init>(): test.AnnotatedAnnotation
+    public constructor AnnotatedAnnotation()
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.AnnotatedMethod : java.lang.Object {
+public open class AnnotatedMethod : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.AnnotatedMethod
+    public constructor AnnotatedMethod()
-    public open jet.deprecated(value = "Deprecated in Java") fun f(): jet.Tuple0
+    jet.deprecated(value = "Deprecated in Java") public open fun f() : Unit
 }
@@ -1,5 +1,5 @@
 namespace test
-public final annotation class test.SimpleAnnotation : jet.Annotation {
+public final annotation class SimpleAnnotation : jet.Annotation {
-    public final /*constructor*/ fun <init>(): test.SimpleAnnotation
+    public constructor SimpleAnnotation()
 }
@@ -1,5 +1,5 @@
 namespace test
-public open class test.ConstructorGenericDeep : java.lang.Object {
+public open class ConstructorGenericDeep : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: java.lang.Class<jet.Any?>?): test.ConstructorGenericDeep
+    public constructor ConstructorGenericDeep(/*0*/ p0 : java.lang.Class<jet.Any?>?)
 }
@@ -1,5 +1,5 @@
 namespace test
-public open class test.ConstructorGenericSimple : java.lang.Object {
+public open class ConstructorGenericSimple : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: jet.Any?): test.ConstructorGenericSimple
+    public constructor ConstructorGenericSimple(/*0*/ p0 : jet.Any?)
 }
@@ -1,5 +1,5 @@
 namespace test
-public open class test.ConstructorGenericUpperBound : java.lang.Object {
+public open class ConstructorGenericUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: java.util.RandomAccess?): test.ConstructorGenericUpperBound
+    public constructor ConstructorGenericUpperBound(/*0*/ p0 : java.util.RandomAccess?)
 }
@@ -1,7 +1,7 @@
 namespace test
-public open class test.DifferentGetterAndSetter : java.lang.Object {
+public open class DifferentGetterAndSetter : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.DifferentGetterAndSetter
+    public constructor DifferentGetterAndSetter()
-    public open fun getSomething(): jet.Int
+    public open fun getSomething() : jet.Int
-    public open fun setSomething(/*0*/ p0: jet.String?): jet.Tuple0
+    public open fun setSomething(/*0*/ p0 : jet.String?) : Unit
 }
@@ -1,5 +1,5 @@
 namespace test
-public abstract trait test.JavaBeanAbstractGetter : java.lang.Object {
+public trait JavaBeanAbstractGetter : java.lang.Object {
-    public abstract fun getRed(): jet.Int
+    public abstract fun getRed() : jet.Int
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.JavaBeanVal : java.lang.Object {
+public open class JavaBeanVal : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.JavaBeanVal
+    public constructor JavaBeanVal()
-    public open fun getColor(): jet.String?
+    public open fun getColor() : jet.String?
 }
@@ -1,7 +1,7 @@
 namespace test
-public open class test.JavaBeanVar : java.lang.Object {
+public open class JavaBeanVar : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.JavaBeanVar
+    public constructor JavaBeanVar()
-    public open fun getColor(): jet.String?
+    public open fun getColor() : jet.String?
-    public open fun setColor(/*0*/ p0: jet.String?): jet.Tuple0
+    public open fun setColor(/*0*/ p0 : jet.String?) : Unit
 }
@@ -1,7 +1,7 @@
 namespace test
-public open class test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?> : java.lang.Object {
+public open class JavaBeanVarOfGenericType</*0*/ P> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.JavaBeanVarOfGenericType<P>
+    public constructor JavaBeanVarOfGenericType</*0*/ P>()
-    public open fun getCharacters(): java.util.ArrayList<P>?
+    public open fun getCharacters() : java.util.ArrayList<P>?
-    public open fun setCharacters(/*0*/ p0: java.util.ArrayList<P>?): jet.Tuple0
+    public open fun setCharacters(/*0*/ p0 : java.util.ArrayList<P>?) : Unit
 }
@@ -1,7 +1,7 @@
 namespace test
-public open class test.TwoSetters : java.lang.Object {
+public open class TwoSetters : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.TwoSetters
+    public constructor TwoSetters()
-    public open fun setSize(/*0*/ p0: jet.Int): jet.Tuple0
+    public open fun setSize(/*0*/ p0 : jet.Int) : Unit
-    public open fun setSize(/*0*/ p0: jet.String?): jet.Tuple0
+    public open fun setSize(/*0*/ p0 : jet.String?) : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.ArrayType : java.lang.Object {
+public open class ArrayType : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ArrayType
+    public constructor ArrayType()
-    public open fun foo(): jet.Array<jet.String>
+    public open fun foo() : jet.Array<jet.String>
 }
@@ -1,5 +1,5 @@
 namespace test
-public open class test.ConstructorWithNewTypeParams</*0*/ T : jet.Any?> : java.lang.Object {
+public open class ConstructorWithNewTypeParams</*0*/ T> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: jet.Any): test.ConstructorWithNewTypeParams<T>
+    public constructor ConstructorWithNewTypeParams</*0*/ T>(/*0*/ p0 : jet.Any)
 }
@@ -1,5 +1,5 @@
 namespace test
-public open class test.ConstructorWithParentTypeParams</*0*/ T : jet.Any?> : java.lang.Object {
+public open class ConstructorWithParentTypeParams</*0*/ T> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: T): test.ConstructorWithParentTypeParams<T>
+    public constructor ConstructorWithParentTypeParams</*0*/ T>(/*0*/ p0 : T)
 }
@@ -1,5 +1,5 @@
 namespace test
-public open class test.ConstructorWithSeveralParams : java.lang.Object {
+public open class ConstructorWithSeveralParams : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int, /*2*/ p2: java.util.ArrayList<jet.String>): test.ConstructorWithSeveralParams
+    public constructor ConstructorWithSeveralParams(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.Int, /*2*/ p2 : java.util.ArrayList<jet.String>)
 }
@@ -1,5 +1,5 @@
 namespace test
-public open class test.ConstructorWithoutParams : java.lang.Object {
+public open class ConstructorWithoutParams : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ConstructorWithoutParams
+    public constructor ConstructorWithoutParams()
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.CustomVariance : java.lang.Object {
+public open class CustomVariance : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.CustomVariance
+    public constructor CustomVariance()
-    public open fun foo(): jet.MutableList<out jet.Number>
+    public open fun foo() : jet.MutableList<out jet.Number>
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.MethodWithFunctionTypes : java.lang.Object {
+public open class MethodWithFunctionTypes : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithFunctionTypes
+    public constructor MethodWithFunctionTypes()
-    public open fun foo(/*0*/ p0: jet.Function1<jet.String?, jet.String>): jet.ExtensionFunction0<jet.String, jet.String?>?
+    public open fun foo(/*0*/ p0 : (jet.String?) -> jet.String) : (jet.String.() -> jet.String?)?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.MethodWithGenerics : java.lang.Object {
+public open class MethodWithGenerics : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithGenerics
+    public constructor MethodWithGenerics()
-    public open fun foo(/*0*/ p0: jet.String, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String>?>): jet.String
+    public open fun foo(/*0*/ p0 : jet.String, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String?, jet.String>?>) : jet.String
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.MethodWithMappedClasses : java.lang.Object {
+public open class MethodWithMappedClasses : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithMappedClasses
+    public constructor MethodWithMappedClasses()
-    public open fun </*0*/ T : jet.Any?>copy(/*0*/ p0: jet.MutableList<in T>, /*1*/ p1: jet.List<out T>): jet.Tuple0
+    public open fun </*0*/ T> copy(/*0*/ p0 : jet.MutableList<in T>, /*1*/ p1 : jet.List<out T>) : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.MethodWithTypeParameters : java.lang.Object {
+public open class MethodWithTypeParameters : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithTypeParameters
+    public constructor MethodWithTypeParameters()
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable & jet.List<java.lang.Cloneable>>foo(/*0*/ p0: A, /*1*/ p1: jet.List<out B>, /*2*/ p2: jet.MutableList<in jet.String?>): jet.Tuple0
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A, /*1*/ p1 : jet.List<out B>, /*2*/ p2 : jet.MutableList<in jet.String?>) : Unit where B : java.lang.Runnable, B : jet.List<java.lang.Cloneable>
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.MethodWithVararg : java.lang.Object {
+public open class MethodWithVararg : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithVararg
+    public constructor MethodWithVararg()
-    public open fun foo(/*0*/ vararg p0: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
+    public open fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
 }
@@ -1,8 +1,8 @@
 namespace test
-public open class test.PropertyArrayTypes</*0*/ T : jet.Any?> : java.lang.Object {
+public open class PropertyArrayTypes</*0*/ T> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyArrayTypes<T>
+    public constructor PropertyArrayTypes</*0*/ T>()
-    public final var array: jet.Array<jet.String>
+    public final var array : jet.Array<jet.String>
-    public final var arrayOfArrays: jet.Array<jet.Array<jet.String>>
+    public final var arrayOfArrays : jet.Array<jet.Array<jet.String>>
-    public final var genericArray: jet.Array<T>
+    public final var genericArray : jet.Array<T>
 }
@@ -1,9 +1,9 @@
 namespace test
-public open class test.PropertyComplexTypes</*0*/ T : jet.Any?> : java.lang.Object {
+public open class PropertyComplexTypes</*0*/ T> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyComplexTypes<T>
+    public constructor PropertyComplexTypes</*0*/ T>()
-    public final var genericType: T
+    public final var genericType : T
-    public final var listDefinedGeneric: java.util.ArrayList<jet.String>
+    public final var listDefinedGeneric : java.util.ArrayList<jet.String>
-    public final var listGeneric: java.util.ArrayList<T>
+    public final var listGeneric : java.util.ArrayList<T>
-    public final var listOfGenericList: java.util.ArrayList<java.util.ArrayList<T>>
+    public final var listOfGenericList : java.util.ArrayList<java.util.ArrayList<T>>
 }
@@ -1,7 +1,7 @@
 namespace test
-public open class test.PropertySimpleType : java.lang.Object {
+public open class PropertySimpleType : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.PropertySimpleType
+    public constructor PropertySimpleType()
-    public final var fieldOne: jet.String
+    public final var fieldOne : jet.String
-    public final var fieldTwo: jet.String?
+    public final var fieldTwo : jet.String?
 }
@@ -1,8 +1,9 @@
 namespace test
-public final class test.StarProjection : java.lang.Object {
+public final class StarProjection : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.StarProjection
+    public constructor StarProjection()
-    public final fun foo(): test.StarProjection.MyClass<out jet.CharSequence?>
+    public final fun foo() : test.StarProjection.MyClass<out jet.CharSequence?>
-    public abstract trait test.StarProjection.MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
+    
    public trait MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
    }
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.AddingNullability : java.lang.Object {
+public open class AddingNullability : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.AddingNullability
+    public constructor AddingNullability()
-    public open fun foo(): jet.Int
+    public open fun foo() : jet.Int
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.ExplicitFieldGettersAndSetters : java.lang.Object {
+public open class ExplicitFieldGettersAndSetters : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ExplicitFieldGettersAndSetters
+    public constructor ExplicitFieldGettersAndSetters()
-    public final var foo: jet.String?
+    public final var foo : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.ExtraUpperBound : java.lang.Object {
+public open class ExtraUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ExtraUpperBound
+    public constructor ExtraUpperBound()
-    public open fun </*0*/ A : java.lang.Runnable?>foo(): jet.String?
+    public open fun </*0*/ A : java.lang.Runnable?> foo() : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.MissingUpperBound : java.lang.Object {
+public open class MissingUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MissingUpperBound
+    public constructor MissingUpperBound()
-    public open fun </*0*/ A : java.lang.Cloneable? & java.lang.Runnable?>foo(): jet.String?
+    public open fun </*0*/ A> foo() : jet.String? where A : java.lang.Cloneable?, A : java.lang.Runnable?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.NoFieldTypeRef : java.lang.Object {
+public open class NoFieldTypeRef : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.NoFieldTypeRef
+    public constructor NoFieldTypeRef()
-    public final var foo: jet.String?
+    public final var foo : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.NotVarargReplacedWithVararg : java.lang.Object {
+public open class NotVarargReplacedWithVararg : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.NotVarargReplacedWithVararg
+    public constructor NotVarargReplacedWithVararg()
-    public open fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+    public open fun foo(/*0*/ p0 : jet.String?) : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.ReturnTypeMissing : java.lang.Object {
+public open class ReturnTypeMissing : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ReturnTypeMissing
+    public constructor ReturnTypeMissing()
-    public open fun foo(/*0*/ p0: jet.String?): jet.Int
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.Int
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.SyntaxError : java.lang.Object {
+public open class SyntaxError : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.SyntaxError
+    public constructor SyntaxError()
-    public open fun foo(): jet.Int?
+    public open fun foo() : jet.Int?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.SyntaxErrorInFieldAnnotation : java.lang.Object {
+public open class SyntaxErrorInFieldAnnotation : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.SyntaxErrorInFieldAnnotation
+    public constructor SyntaxErrorInFieldAnnotation()
-    public final var foo: jet.String?
+    public final var foo : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.VarargReplacedWithNotVararg : java.lang.Object {
+public open class VarargReplacedWithNotVararg : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.VarargReplacedWithNotVararg
+    public constructor VarargReplacedWithNotVararg()
-    public open fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+    public open fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongFieldInitializer : java.lang.Object {
+public open class WrongFieldInitializer : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongFieldInitializer
+    public constructor WrongFieldInitializer()
-    public final var foo: jet.String?
+    public final var foo : jet.String?
 }
@@ -1,7 +1,7 @@
 namespace test
-public open class test.WrongFieldMutability : java.lang.Object {
+public open class WrongFieldMutability : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongFieldMutability
+    public constructor WrongFieldMutability()
-    public final val fooFinal: jet.String?
+    public final val fooFinal : jet.String?
-    public final var fooNotFinal: jet.String?
+    public final var fooNotFinal : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongFieldName : java.lang.Object {
+public open class WrongFieldName : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongFieldName
+    public constructor WrongFieldName()
-    public final var foo: jet.String?
+    public final var foo : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongMethodName : java.lang.Object {
+public open class WrongMethodName : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongMethodName
+    public constructor WrongMethodName()
-    public open fun foo(): jet.String?
+    public open fun foo() : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongReturnTypeStructure : java.lang.Object {
+public open class WrongReturnTypeStructure : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongReturnTypeStructure
+    public constructor WrongReturnTypeStructure()
-    public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
+    public open fun foo(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String, jet.String>>?) : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongTypeName1 : java.lang.Object {
+public open class WrongTypeName1 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeName1
+    public constructor WrongTypeName1()
-    public open fun foo(/*0*/ p0: jet.String?): jet.String?
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongTypeName2 : java.lang.Object {
+public open class WrongTypeName2 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeName2
+    public constructor WrongTypeName2()
-    public open fun foo(/*0*/ p0: jet.String?): jet.String?
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongTypeName3 : java.lang.Object {
+public open class WrongTypeName3 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeName3
+    public constructor WrongTypeName3()
-    public open fun foo(/*0*/ p0: jet.String?): jet.String?
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongTypeParameterBoundStructure1 : java.lang.Object {
+public open class WrongTypeParameterBoundStructure1 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure1
+    public constructor WrongTypeParameterBoundStructure1()
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongTypeParameterBoundStructure2 : java.lang.Object {
+public open class WrongTypeParameterBoundStructure2 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure2
+    public constructor WrongTypeParameterBoundStructure2()
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongTypeParametersCount : java.lang.Object {
+public open class WrongTypeParametersCount : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeParametersCount
+    public constructor WrongTypeParametersCount()
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : jet.Any?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongTypeVariance : java.lang.Object {
+public open class WrongTypeVariance : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeVariance
+    public constructor WrongTypeVariance()
-    public open fun copy(/*0*/ p0: jet.Array<out jet.Number>?, /*1*/ p1: jet.Array<out jet.Number>?): jet.MutableList<jet.Number>?
+    public open fun copy(/*0*/ p0 : jet.Array<out jet.Number>?, /*1*/ p1 : jet.Array<out jet.Number>?) : jet.MutableList<jet.Number>?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongValueParameterStructure1 : java.lang.Object {
+public open class WrongValueParameterStructure1 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure1
+    public constructor WrongValueParameterStructure1()
-    public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
+    public open fun foo(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String, jet.String>>?) : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongValueParameterStructure2 : java.lang.Object {
+public open class WrongValueParameterStructure2 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure2
+    public constructor WrongValueParameterStructure2()
-    public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
+    public open fun foo(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String, jet.String>>?) : jet.String?
 }
@@ -1,6 +1,6 @@
 namespace test
-public open class test.WrongValueParametersCount : java.lang.Object {
+public open class WrongValueParametersCount : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongValueParametersCount
+    public constructor WrongValueParametersCount()
-    public open fun foo(): jet.Int?
+    public open fun foo() : jet.Int?
 }
@@ -1,20 +1,22 @@
 namespace test
-public abstract trait test.PropagateTypeArgumentNullable : java.lang.Object {
+public trait PropagateTypeArgumentNullable : java.lang.Object {
-    public abstract trait test.PropagateTypeArgumentNullable.Sub : test.PropagateTypeArgumentNullable.Super {
+    
-        public abstract override /*1*/ fun invOutR(): jet.MutableList<jet.List<jet.String?>>
+    public trait Sub : test.PropagateTypeArgumentNullable.Super {
-        public abstract override /*1*/ fun invOutS(/*0*/ p0: jet.MutableList<jet.List<jet.String?>>): jet.Tuple0
+        public abstract override /*1*/ fun invOutR() : jet.MutableList<jet.List<jet.String?>>
-        public abstract override /*1*/ fun invR(): jet.MutableList<jet.String?>
+        public abstract override /*1*/ fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : Unit
-        public abstract override /*1*/ fun outOutS(/*0*/ p0: jet.List<jet.List<jet.String?>>): jet.Tuple0
+        public abstract override /*1*/ fun invR() : jet.MutableList<jet.String?>
-        public abstract override /*1*/ fun outR(): jet.List<jet.String?>
+        public abstract override /*1*/ fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : Unit
-        public abstract override /*1*/ fun outS(/*0*/ p0: jet.List<jet.String?>): jet.Tuple0
+        public abstract override /*1*/ fun outR() : jet.List<jet.String?>
        public abstract override /*1*/ fun outS(/*0*/ p0 : jet.List<jet.String?>) : Unit
    }
-    public abstract trait test.PropagateTypeArgumentNullable.Super : java.lang.Object {
+    
-        public abstract fun invOutR(): jet.MutableList<jet.List<jet.String?>>
+    public trait Super : java.lang.Object {
-        public abstract fun invOutS(/*0*/ p0: jet.MutableList<jet.List<jet.String?>>): jet.Tuple0
+        public abstract fun invOutR() : jet.MutableList<jet.List<jet.String?>>
-        public abstract fun invR(): jet.MutableList<jet.String?>
+        public abstract fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : Unit
-        public abstract fun outOutS(/*0*/ p0: jet.List<jet.List<jet.String?>>): jet.Tuple0
+        public abstract fun invR() : jet.MutableList<jet.String?>
-        public abstract fun outR(): jet.List<jet.String?>
+        public abstract fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : Unit
-        public abstract fun outS(/*0*/ p0: jet.List<jet.String?>): jet.Tuple0
+        public abstract fun outR() : jet.List<jet.String?>
        public abstract fun outS(/*0*/ p0 : jet.List<jet.String?>) : Unit
    }
 }
@@ -1,10 +1,12 @@
 namespace test
-public abstract trait test.ChangeProjectionKind1 : java.lang.Object {
+public trait ChangeProjectionKind1 : java.lang.Object {
-    public abstract trait test.ChangeProjectionKind1.Sub : test.ChangeProjectionKind1.Super {
+    
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+    public trait Sub : test.ChangeProjectionKind1.Super {
        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
    }
-    public abstract trait test.ChangeProjectionKind1.Super : java.lang.Object {
+    
-        public abstract fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+    public trait Super : java.lang.Object {
        public abstract fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
    }
 }
@@ -1,10 +1,12 @@
 namespace test
-public abstract trait test.ChangeProjectionKind2 : java.lang.Object {
+public trait ChangeProjectionKind2 : java.lang.Object {
-    public abstract trait test.ChangeProjectionKind2.Sub : test.ChangeProjectionKind2.Super {
+    
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+    public trait Sub : test.ChangeProjectionKind2.Super {
        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
    }
-    public abstract trait test.ChangeProjectionKind2.Super : java.lang.Object {
+    
-        public abstract fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+    public trait Super : java.lang.Object {
        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
    }
 }
--- a/Show More
+++ b/Show More
`@@ -1,2 +1 @@`
	`namespace DeeplyInnerClass`	`namespace DeeplyInnerClass`