diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java index aea08b57288..3af116bc723 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java @@ -46,11 +46,8 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder { } AbstractDescriptorFinder _this = AbstractDescriptorFinder.this; - ClassDescriptor classDescriptor = - new DeserializedClassDescriptor(storageManager, _this.annotationDeserializer, _this, packageFragmentProvider, - classData.getNameResolver(), classData.getClassProto()); - classDescriptorCreated(classDescriptor); - return classDescriptor; + return new DeserializedClassDescriptor(storageManager, _this.annotationDeserializer, _this, packageFragmentProvider, + classData.getNameResolver(), classData.getClassProto()); } }); } @@ -63,7 +60,4 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder { @Nullable protected abstract ClassData getClassData(@NotNull ClassId classId); - - protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) { - } } diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index 8847bcd860b..a5d3a7b7dc1 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -1,22 +1,22 @@ package-fragment jet -public fun arrayOfNulls(/*0*/ size: jet.Int): jet.Array -public fun synchronized(/*0*/ lock: jet.Any, /*1*/ block: () -> R): R +public fun arrayOfNulls(/*0*/ size: jet.Int): jet.Array +public fun synchronized(/*0*/ lock: jet.Any, /*1*/ block: jet.Function0): R public fun jet.Any?.equals(/*0*/ other: jet.Any?): jet.Boolean public fun jet.Any?.identityEquals(/*0*/ other: jet.Any?): jet.Boolean -public fun jet.Iterator.iterator(): jet.Iterator +public fun jet.Iterator.iterator(): jet.Iterator public fun jet.String?.plus(/*0*/ other: jet.Any?): jet.String public fun jet.Any?.toString(): jet.String -public trait Annotation { +public trait Annotation : jet.Any { } public open class Any { /*primary*/ public constructor Any() } -public final class Array { - /*primary*/ public constructor Array(/*0*/ size: jet.Int, /*1*/ init: (jet.Int) -> T) +public final class Array : jet.Any { + /*primary*/ public constructor Array(/*0*/ size: jet.Int, /*1*/ init: jet.Function1) public final val indices: jet.IntRange public final fun (): jet.IntRange public final val size: jet.Int @@ -26,7 +26,7 @@ public final class Array { public final fun set(/*0*/ index: jet.Int, /*1*/ value: T): jet.Unit } -public final class Boolean { +public final class Boolean : jet.Any { /*primary*/ private constructor Boolean() public final fun and(/*0*/ other: jet.Boolean): jet.Boolean public final fun equals(/*0*/ other: jet.Any?): jet.Boolean @@ -35,7 +35,7 @@ public final class Boolean { public final fun xor(/*0*/ other: jet.Boolean): jet.Boolean } -public final class BooleanArray { +public final class BooleanArray : jet.Any { /*primary*/ public constructor BooleanArray(/*0*/ size: jet.Int) public final val indices: jet.IntRange public final fun (): jet.IntRange @@ -119,7 +119,7 @@ public final class Byte : jet.Number, jet.Comparable { public open override /*1*/ fun toShort(): jet.Short } -public final class ByteArray { +public final class ByteArray : jet.Any { /*primary*/ public constructor ByteArray(/*0*/ size: jet.Int) public final val indices: jet.IntRange public final fun (): jet.IntRange @@ -159,7 +159,7 @@ public final class ByteRange : jet.Range, jet.Progression { public open override /*1*/ fun contains(/*0*/ item: jet.Byte): jet.Boolean public open override /*1*/ fun iterator(): jet.ByteIterator - public class object { + public class object : jet.Any { /*primary*/ private constructor () public final val EMPTY: jet.ByteRange public final fun (): jet.ByteRange @@ -222,7 +222,7 @@ public final class Char : jet.Hashable, jet.Comparable { public final fun toShort(): jet.Short } -public final class CharArray { +public final class CharArray : jet.Any { /*primary*/ public constructor CharArray(/*0*/ size: jet.Int) public final val indices: jet.IntRange public final fun (): jet.IntRange @@ -262,21 +262,21 @@ public final class CharRange : jet.Range, jet.Progression { public open override /*1*/ fun contains(/*0*/ item: jet.Char): jet.Boolean public open override /*1*/ fun iterator(): jet.CharIterator - public class object { + public class object : jet.Any { /*primary*/ private constructor () public final val EMPTY: jet.CharRange public final fun (): jet.CharRange } } -public trait CharSequence { +public trait CharSequence : jet.Any { public abstract val length: jet.Int public abstract fun (): jet.Int public abstract fun get(/*0*/ index: jet.Int): jet.Char public abstract fun toString(): jet.String } -public trait Collection : jet.Iterable, jet.Hashable { +public trait Collection : jet.Iterable, jet.Hashable { public abstract fun contains(/*0*/ o: jet.Any?): jet.Boolean public abstract fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean @@ -286,7 +286,7 @@ public trait Collection : jet.Iterable, jet.Hashable { public abstract fun size(): jet.Int } -public trait Comparable { +public trait Comparable : jet.Any { public abstract fun compareTo(/*0*/ other: T): jet.Int } @@ -355,7 +355,7 @@ public final class Double : jet.Number, jet.Comparable { public open override /*1*/ fun toShort(): jet.Short } -public final class DoubleArray { +public final class DoubleArray : jet.Any { /*primary*/ public constructor DoubleArray(/*0*/ size: jet.Int) public final val indices: jet.IntRange public final fun (): jet.IntRange @@ -395,108 +395,108 @@ public final class DoubleRange : jet.Range, jet.Progression { + public class object : jet.Any { /*primary*/ private constructor () public final val EMPTY: jet.DoubleRange public final fun (): jet.DoubleRange } } -public abstract class Enum> { +public abstract class Enum> : jet.Any { /*primary*/ public constructor Enum>(/*0*/ name: jet.String, /*1*/ ordinal: jet.Int) public final fun name(): jet.String public final fun ordinal(): jet.Int } -public trait ExtensionFunction0 { +public trait ExtensionFunction0 : jet.Any { public abstract fun T.invoke(): R } -public trait ExtensionFunction1 { +public trait ExtensionFunction1 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1): R } -public trait ExtensionFunction10 { +public trait ExtensionFunction10 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R } -public trait ExtensionFunction11 { +public trait ExtensionFunction11 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R } -public trait ExtensionFunction12 { +public trait ExtensionFunction12 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R } -public trait ExtensionFunction13 { +public trait ExtensionFunction13 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R } -public trait ExtensionFunction14 { +public trait ExtensionFunction14 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R } -public trait ExtensionFunction15 { +public trait ExtensionFunction15 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R } -public trait ExtensionFunction16 { +public trait ExtensionFunction16 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R } -public trait ExtensionFunction17 { +public trait ExtensionFunction17 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R } -public trait ExtensionFunction18 { +public trait ExtensionFunction18 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R } -public trait ExtensionFunction19 { +public trait ExtensionFunction19 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R } -public trait ExtensionFunction2 { +public trait ExtensionFunction2 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2): R } -public trait ExtensionFunction20 { +public trait ExtensionFunction20 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R } -public trait ExtensionFunction21 { +public trait ExtensionFunction21 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R } -public trait ExtensionFunction22 { +public trait ExtensionFunction22 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R } -public trait ExtensionFunction3 { +public trait ExtensionFunction3 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R } -public trait ExtensionFunction4 { +public trait ExtensionFunction4 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R } -public trait ExtensionFunction5 { +public trait ExtensionFunction5 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R } -public trait ExtensionFunction6 { +public trait ExtensionFunction6 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R } -public trait ExtensionFunction7 { +public trait ExtensionFunction7 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R } -public trait ExtensionFunction8 { +public trait ExtensionFunction8 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R } -public trait ExtensionFunction9 { +public trait ExtensionFunction9 : jet.Any { public abstract fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R } @@ -566,7 +566,7 @@ public final class Float : jet.Number, jet.Comparable { public open override /*1*/ fun toShort(): jet.Short } -public final class FloatArray { +public final class FloatArray : jet.Any { /*primary*/ public constructor FloatArray(/*0*/ size: jet.Int) public final val indices: jet.IntRange public final fun (): jet.IntRange @@ -606,106 +606,106 @@ public final class FloatRange : jet.Range, jet.Progression public open override /*1*/ fun contains(/*0*/ item: jet.Float): jet.Boolean public open override /*1*/ fun iterator(): jet.FloatIterator - public class object { + public class object : jet.Any { /*primary*/ private constructor () public final val EMPTY: jet.FloatRange public final fun (): jet.FloatRange } } -public trait Function0 { +public trait Function0 : jet.Any { public abstract fun invoke(): R } -public trait Function1 { +public trait Function1 : jet.Any { public abstract fun invoke(/*0*/ p1: P1): R } -public trait Function10 { +public trait Function10 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R } -public trait Function11 { +public trait Function11 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R } -public trait Function12 { +public trait Function12 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R } -public trait Function13 { +public trait Function13 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R } -public trait Function14 { +public trait Function14 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R } -public trait Function15 { +public trait Function15 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R } -public trait Function16 { +public trait Function16 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R } -public trait Function17 { +public trait Function17 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R } -public trait Function18 { +public trait Function18 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R } -public trait Function19 { +public trait Function19 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R } -public trait Function2 { +public trait Function2 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2): R } -public trait Function20 { +public trait Function20 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R } -public trait Function21 { +public trait Function21 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R } -public trait Function22 { +public trait Function22 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R } -public trait Function3 { +public trait Function3 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R } -public trait Function4 { +public trait Function4 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R } -public trait Function5 { +public trait Function5 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R } -public trait Function6 { +public trait Function6 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R } -public trait Function7 { +public trait Function7 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R } -public trait Function8 { +public trait Function8 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R } -public trait Function9 { +public trait Function9 : jet.Any { public abstract fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R } -public trait Hashable { +public trait Hashable : jet.Any { public abstract fun equals(/*0*/ other: jet.Any?): jet.Boolean public abstract fun hashCode(): jet.Int } @@ -819,7 +819,7 @@ public final class Int : jet.Number, jet.Comparable { public final fun xor(/*0*/ other: jet.Int): jet.Int } -public final class IntArray { +public final class IntArray : jet.Any { /*primary*/ public constructor IntArray(/*0*/ size: jet.Int) public final val indices: jet.IntRange public final fun (): jet.IntRange @@ -859,299 +859,299 @@ public final class IntRange : jet.Range, jet.Progression { public open override /*1*/ fun contains(/*0*/ item: jet.Int): jet.Boolean public open override /*1*/ fun iterator(): jet.IntIterator - public class object { + public class object : jet.Any { /*primary*/ private constructor () public final val EMPTY: jet.IntRange public final fun (): jet.IntRange } } -public trait Iterable { +public trait Iterable : jet.Any { public abstract fun iterator(): jet.Iterator } -public trait Iterator { +public trait Iterator : jet.Any { public abstract fun hasNext(): jet.Boolean public abstract fun next(): T } -public trait KExtensionFunction0 : T.() -> R { +public trait KExtensionFunction0 : jet.ExtensionFunction0 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(): R } -public trait KExtensionFunction1 : T.(P1) -> R { +public trait KExtensionFunction1 : jet.ExtensionFunction1 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1): R } -public trait KExtensionFunction10 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10) -> R { +public trait KExtensionFunction10 : jet.ExtensionFunction10 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R } -public trait KExtensionFunction11 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11) -> R { +public trait KExtensionFunction11 : jet.ExtensionFunction11 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R } -public trait KExtensionFunction12 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12) -> R { +public trait KExtensionFunction12 : jet.ExtensionFunction12 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R } -public trait KExtensionFunction13 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13) -> R { +public trait KExtensionFunction13 : jet.ExtensionFunction13 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R } -public trait KExtensionFunction14 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14) -> R { +public trait KExtensionFunction14 : jet.ExtensionFunction14 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R } -public trait KExtensionFunction15 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15) -> R { +public trait KExtensionFunction15 : jet.ExtensionFunction15 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R } -public trait KExtensionFunction16 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16) -> R { +public trait KExtensionFunction16 : jet.ExtensionFunction16 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R } -public trait KExtensionFunction17 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17) -> R { +public trait KExtensionFunction17 : jet.ExtensionFunction17 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R } -public trait KExtensionFunction18 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18) -> R { +public trait KExtensionFunction18 : jet.ExtensionFunction18 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R } -public trait KExtensionFunction19 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19) -> R { +public trait KExtensionFunction19 : jet.ExtensionFunction19 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R } -public trait KExtensionFunction2 : T.(P1, P2) -> R { +public trait KExtensionFunction2 : jet.ExtensionFunction2 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2): R } -public trait KExtensionFunction20 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20) -> R { +public trait KExtensionFunction20 : jet.ExtensionFunction20 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R } -public trait KExtensionFunction21 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21) -> R { +public trait KExtensionFunction21 : jet.ExtensionFunction21 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R } -public trait KExtensionFunction22 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22) -> R { +public trait KExtensionFunction22 : jet.ExtensionFunction22 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R } -public trait KExtensionFunction3 : T.(P1, P2, P3) -> R { +public trait KExtensionFunction3 : jet.ExtensionFunction3 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R } -public trait KExtensionFunction4 : T.(P1, P2, P3, P4) -> R { +public trait KExtensionFunction4 : jet.ExtensionFunction4 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R } -public trait KExtensionFunction5 : T.(P1, P2, P3, P4, P5) -> R { +public trait KExtensionFunction5 : jet.ExtensionFunction5 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R } -public trait KExtensionFunction6 : T.(P1, P2, P3, P4, P5, P6) -> R { +public trait KExtensionFunction6 : jet.ExtensionFunction6 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R } -public trait KExtensionFunction7 : T.(P1, P2, P3, P4, P5, P6, P7) -> R { +public trait KExtensionFunction7 : jet.ExtensionFunction7 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R } -public trait KExtensionFunction8 : T.(P1, P2, P3, P4, P5, P6, P7, P8) -> R { +public trait KExtensionFunction8 : jet.ExtensionFunction8 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R } -public trait KExtensionFunction9 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9) -> R { +public trait KExtensionFunction9 : jet.ExtensionFunction9 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R } -public trait KFunction0 : () -> R { +public trait KFunction0 : jet.Function0 { public abstract override /*1*/ /*fake_override*/ fun invoke(): R } -public trait KFunction1 : (P1) -> R { +public trait KFunction1 : jet.Function1 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1): R } -public trait KFunction10 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10) -> R { +public trait KFunction10 : jet.Function10 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R } -public trait KFunction11 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11) -> R { +public trait KFunction11 : jet.Function11 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R } -public trait KFunction12 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12) -> R { +public trait KFunction12 : jet.Function12 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R } -public trait KFunction13 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13) -> R { +public trait KFunction13 : jet.Function13 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R } -public trait KFunction14 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14) -> R { +public trait KFunction14 : jet.Function14 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R } -public trait KFunction15 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15) -> R { +public trait KFunction15 : jet.Function15 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R } -public trait KFunction16 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16) -> R { +public trait KFunction16 : jet.Function16 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R } -public trait KFunction17 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17) -> R { +public trait KFunction17 : jet.Function17 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R } -public trait KFunction18 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18) -> R { +public trait KFunction18 : jet.Function18 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R } -public trait KFunction19 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19) -> R { +public trait KFunction19 : jet.Function19 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R } -public trait KFunction2 : (P1, P2) -> R { +public trait KFunction2 : jet.Function2 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2): R } -public trait KFunction20 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20) -> R { +public trait KFunction20 : jet.Function20 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R } -public trait KFunction21 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21) -> R { +public trait KFunction21 : jet.Function21 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R } -public trait KFunction22 : (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22) -> R { +public trait KFunction22 : jet.Function22 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R } -public trait KFunction3 : (P1, P2, P3) -> R { +public trait KFunction3 : jet.Function3 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R } -public trait KFunction4 : (P1, P2, P3, P4) -> R { +public trait KFunction4 : jet.Function4 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R } -public trait KFunction5 : (P1, P2, P3, P4, P5) -> R { +public trait KFunction5 : jet.Function5 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R } -public trait KFunction6 : (P1, P2, P3, P4, P5, P6) -> R { +public trait KFunction6 : jet.Function6 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R } -public trait KFunction7 : (P1, P2, P3, P4, P5, P6, P7) -> R { +public trait KFunction7 : jet.Function7 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R } -public trait KFunction8 : (P1, P2, P3, P4, P5, P6, P7, P8) -> R { +public trait KFunction8 : jet.Function8 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R } -public trait KFunction9 : (P1, P2, P3, P4, P5, P6, P7, P8, P9) -> R { +public trait KFunction9 : jet.Function9 { public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R } -public trait KMemberFunction0 : T.() -> R { +public trait KMemberFunction0 : jet.ExtensionFunction0 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(): R } -public trait KMemberFunction1 : T.(P1) -> R { +public trait KMemberFunction1 : jet.ExtensionFunction1 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1): R } -public trait KMemberFunction10 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10) -> R { +public trait KMemberFunction10 : jet.ExtensionFunction10 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R } -public trait KMemberFunction11 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11) -> R { +public trait KMemberFunction11 : jet.ExtensionFunction11 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R } -public trait KMemberFunction12 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12) -> R { +public trait KMemberFunction12 : jet.ExtensionFunction12 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R } -public trait KMemberFunction13 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13) -> R { +public trait KMemberFunction13 : jet.ExtensionFunction13 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R } -public trait KMemberFunction14 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14) -> R { +public trait KMemberFunction14 : jet.ExtensionFunction14 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R } -public trait KMemberFunction15 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15) -> R { +public trait KMemberFunction15 : jet.ExtensionFunction15 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R } -public trait KMemberFunction16 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16) -> R { +public trait KMemberFunction16 : jet.ExtensionFunction16 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R } -public trait KMemberFunction17 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17) -> R { +public trait KMemberFunction17 : jet.ExtensionFunction17 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R } -public trait KMemberFunction18 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18) -> R { +public trait KMemberFunction18 : jet.ExtensionFunction18 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R } -public trait KMemberFunction19 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19) -> R { +public trait KMemberFunction19 : jet.ExtensionFunction19 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R } -public trait KMemberFunction2 : T.(P1, P2) -> R { +public trait KMemberFunction2 : jet.ExtensionFunction2 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2): R } -public trait KMemberFunction20 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20) -> R { +public trait KMemberFunction20 : jet.ExtensionFunction20 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R } -public trait KMemberFunction21 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21) -> R { +public trait KMemberFunction21 : jet.ExtensionFunction21 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R } -public trait KMemberFunction22 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22) -> R { +public trait KMemberFunction22 : jet.ExtensionFunction22 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R } -public trait KMemberFunction3 : T.(P1, P2, P3) -> R { +public trait KMemberFunction3 : jet.ExtensionFunction3 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R } -public trait KMemberFunction4 : T.(P1, P2, P3, P4) -> R { +public trait KMemberFunction4 : jet.ExtensionFunction4 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R } -public trait KMemberFunction5 : T.(P1, P2, P3, P4, P5) -> R { +public trait KMemberFunction5 : jet.ExtensionFunction5 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R } -public trait KMemberFunction6 : T.(P1, P2, P3, P4, P5, P6) -> R { +public trait KMemberFunction6 : jet.ExtensionFunction6 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R } -public trait KMemberFunction7 : T.(P1, P2, P3, P4, P5, P6, P7) -> R { +public trait KMemberFunction7 : jet.ExtensionFunction7 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R } -public trait KMemberFunction8 : T.(P1, P2, P3, P4, P5, P6, P7, P8) -> R { +public trait KMemberFunction8 : jet.ExtensionFunction8 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R } -public trait KMemberFunction9 : T.(P1, P2, P3, P4, P5, P6, P7, P8, P9) -> R { +public trait KMemberFunction9 : jet.ExtensionFunction9 { public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R } -public trait List : jet.Collection { +public trait List : jet.Collection { public abstract override /*1*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean public abstract override /*1*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean @@ -1167,7 +1167,7 @@ public trait List : jet.Collection { public abstract fun subList(/*0*/ fromIndex: jet.Int, /*1*/ toIndex: jet.Int): jet.List } -public trait ListIterator : jet.Iterator { +public trait ListIterator : jet.Iterator { public abstract override /*1*/ fun hasNext(): jet.Boolean public abstract fun hasPrevious(): jet.Boolean public abstract override /*1*/ fun next(): T @@ -1249,7 +1249,7 @@ public final class Long : jet.Number, jet.Comparable { public final fun xor(/*0*/ other: jet.Long): jet.Long } -public final class LongArray { +public final class LongArray : jet.Any { /*primary*/ public constructor LongArray(/*0*/ size: jet.Int) public final val indices: jet.IntRange public final fun (): jet.IntRange @@ -1289,14 +1289,14 @@ public final class LongRange : jet.Range, jet.Progression { public open override /*1*/ fun contains(/*0*/ item: jet.Long): jet.Boolean public open override /*1*/ fun iterator(): jet.LongIterator - public class object { + public class object : jet.Any { /*primary*/ private constructor () public final val EMPTY: jet.LongRange public final fun (): jet.LongRange } } -public trait Map { +public trait Map : jet.Any { public abstract fun containsKey(/*0*/ key: jet.Any?): jet.Boolean public abstract fun containsValue(/*0*/ value: jet.Any?): jet.Boolean public abstract fun entrySet(): jet.Set> @@ -1306,7 +1306,7 @@ public trait Map { public abstract fun size(): jet.Int public abstract fun values(): jet.Collection - public trait Entry : jet.Hashable { + public trait Entry : jet.Hashable { public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean public abstract fun getKey(): K public abstract fun getValue(): V @@ -1314,7 +1314,7 @@ public trait Map { } } -public trait MutableCollection : jet.Collection, jet.MutableIterable { +public trait MutableCollection : jet.Collection, jet.MutableIterable { public abstract fun add(/*0*/ e: E): jet.Boolean public abstract fun addAll(/*0*/ c: jet.Collection): jet.Boolean public abstract fun clear(): jet.Unit @@ -1330,17 +1330,17 @@ public trait MutableCollection : jet.Collection, jet.MutableIterable public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int } -public trait MutableIterable : jet.Iterable { +public trait MutableIterable : jet.Iterable { public abstract override /*1*/ fun iterator(): jet.MutableIterator } -public trait MutableIterator : jet.Iterator { +public trait MutableIterator : jet.Iterator { public abstract override /*1*/ /*fake_override*/ fun hasNext(): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun next(): T public abstract fun remove(): jet.Unit } -public trait MutableList : jet.List, jet.MutableCollection { +public trait MutableList : jet.List, jet.MutableCollection { public abstract override /*1*/ fun add(/*0*/ e: E): jet.Boolean public abstract fun add(/*0*/ index: jet.Int, /*1*/ element: E): jet.Unit public abstract override /*1*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean @@ -1366,7 +1366,7 @@ public trait MutableList : jet.List, jet.MutableCollection { public abstract override /*1*/ fun subList(/*0*/ fromIndex: jet.Int, /*1*/ toIndex: jet.Int): jet.MutableList } -public trait MutableListIterator : jet.ListIterator, jet.MutableIterator { +public trait MutableListIterator : jet.ListIterator, jet.MutableIterator { public abstract fun add(/*0*/ e: T): jet.Unit public abstract override /*2*/ fun hasNext(): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun hasPrevious(): jet.Boolean @@ -1378,7 +1378,7 @@ public trait MutableListIterator : jet.ListIterator, jet.MutableIter public abstract fun set(/*0*/ e: T): jet.Unit } -public trait MutableMap : jet.Map { +public trait MutableMap : jet.Map { public abstract fun clear(): jet.Unit public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: jet.Any?): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: jet.Any?): jet.Boolean @@ -1392,7 +1392,7 @@ public trait MutableMap : jet.Map { public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int public abstract override /*1*/ fun values(): jet.MutableCollection - public trait MutableEntry : jet.Map.Entry, jet.Hashable { + public trait MutableEntry : jet.Map.Entry, jet.Hashable { public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun getKey(): K public abstract override /*1*/ /*fake_override*/ fun getValue(): V @@ -1401,7 +1401,7 @@ public trait MutableMap : jet.Map { } } -public trait MutableSet : jet.Set, jet.MutableCollection { +public trait MutableSet : jet.Set, jet.MutableCollection { public abstract override /*1*/ fun add(/*0*/ e: E): jet.Boolean public abstract override /*1*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ fun clear(): jet.Unit @@ -1444,7 +1444,7 @@ public trait Progression : jet.Iterable { public abstract override /*1*/ /*fake_override*/ fun iterator(): jet.Iterator } -public trait PropertyMetadata { +public trait PropertyMetadata : jet.Any { public abstract val name: jet.String public abstract fun (): jet.String } @@ -1455,7 +1455,7 @@ public final class PropertyMetadataImpl : jet.PropertyMetadata { public open override /*1*/ fun (): jet.String } -public trait Range> { +public trait Range> : jet.Any { public abstract val end: T public abstract fun (): T public abstract val start: T @@ -1463,7 +1463,7 @@ public trait Range> { public abstract fun contains(/*0*/ item: T): jet.Boolean } -public trait Set : jet.Collection { +public trait Set : jet.Collection { public abstract override /*1*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean public abstract override /*1*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean @@ -1539,7 +1539,7 @@ public final class Short : jet.Number, jet.Comparable { public open override /*1*/ fun toShort(): jet.Short } -public final class ShortArray { +public final class ShortArray : jet.Any { /*primary*/ public constructor ShortArray(/*0*/ size: jet.Int) public final val indices: jet.IntRange public final fun (): jet.IntRange @@ -1579,7 +1579,7 @@ public final class ShortRange : jet.Range, jet.Progression public open override /*1*/ fun contains(/*0*/ item: jet.Short): jet.Boolean public open override /*1*/ fun iterator(): jet.ShortIterator - public class object { + public class object : jet.Any { /*primary*/ private constructor () public final val EMPTY: jet.ShortRange public final fun (): jet.ShortRange @@ -1597,17 +1597,17 @@ public final class String : jet.Comparable, jet.CharSequence { public open override /*1*/ fun toString(): jet.String } -public open class Throwable { +public open class Throwable : jet.Any { /*primary*/ public constructor Throwable(/*0*/ message: jet.String? = ..., /*1*/ cause: jet.Throwable? = ...) public final fun getCause(): jet.Throwable? public final fun getMessage(): jet.String? public final fun printStackTrace(): jet.Unit } -public final class Unit { +public final class Unit : jet.Any { /*primary*/ private constructor Unit() - public class object { + public class object : jet.Any { /*primary*/ private constructor () public final val VALUE: jet.Unit public final fun (): jet.Unit diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java deleted file mode 100644 index 266d6b28487..00000000000 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.descriptors.serialization; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer; -import org.jetbrains.jet.jvm.compiler.ExpectedLoadErrorsUtil; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; -import org.jetbrains.jet.storage.LockBasedStorageManager; -import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; - -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment { - @Override - protected JetCoreEnvironment createEnvironment() { - return createEnvironmentWithJdk(ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.FULL_JDK); - } - - public void testBuiltIns() throws Exception { - Collection allDescriptors = KotlinBuiltIns.getInstance().getBuiltInsPackageScope().getAllDescriptors(); - PackageFragmentDescriptor actualPackage = getDeserializedDescriptorsAsPackage(allDescriptors); - - RecursiveDescriptorComparator.Configuration configuration = RecursiveDescriptorComparator.RECURSIVE.withRenderer( - new DescriptorRendererBuilder() - .setWithDefinedIn(false) - .setExcludedAnnotationClasses(Arrays.asList(new FqName(ExpectedLoadErrorsUtil.ANNOTATION_CLASS_NAME))) - .setOverrideRenderingPolicy(DescriptorRenderer.OverrideRenderingPolicy.RENDER_OPEN_OVERRIDE) - .setVerbose(true) - .setAlwaysRenderAny(true) - .setPrettyFunctionTypes(false) - .build() - ); - RecursiveDescriptorComparator - .validateAndCompareDescriptors(KotlinBuiltIns.getInstance().getBuiltInsPackageFragment(), actualPackage, configuration, null); - } - - private static PackageFragmentDescriptor getDeserializedDescriptorsAsPackage(Collection allDescriptors) { - DescriptorSerializer serializer = new DescriptorSerializer(); - - final Map classProtos = serializeClasses(serializer, allDescriptors); - - List callableProtos = serializeCallables(serializer, allDescriptors); - - final MutablePackageFragmentDescriptor actualPackage = JetTestUtils.createTestPackageFragment(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME); - - final NameResolver nameResolver = NameSerializationUtil.createNameResolver(serializer.getNameTable()); - - DescriptorFinder finder = new AbstractDescriptorFinder(new LockBasedStorageManager(), AnnotationDeserializer.UNSUPPORTED, - actualPackage.getContainingDeclaration().getPackageFragmentProvider()) { - - @NotNull - @Override - public Collection getClassNames(@NotNull FqName packageName) { - throw new UnsupportedOperationException(); - } - - @Nullable - @Override - protected ClassData getClassData(@NotNull ClassId classId) { - ProtoBuf.Class classProto = classProtos.get(classId); - assert classProto != null : "Class not found: " + classId; - return new ClassData(nameResolver, classProto); - } - - @Override - protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) { - if (!DescriptorUtils.isTopLevelDeclaration(classDescriptor)) return; - switch (classDescriptor.getKind()) { - case CLASS: - case TRAIT: - case ENUM_CLASS: - case ANNOTATION_CLASS: - case OBJECT: - actualPackage.getMemberScope().addClassifierDescriptor(classDescriptor); - break; - case ENUM_ENTRY: - assert false : "Enum entry appears to be a top-level declaration: " + classDescriptor; - case CLASS_OBJECT: - assert false : "Class object appears to be a top-level declaration: " + classDescriptor; - } - } - }; - - // Make the lazy loader create classes - for (ClassId classId : classProtos.keySet()) { - finder.findClass(classId); - } - - deserializeCallables(callableProtos, actualPackage, nameResolver, finder); - - actualPackage.getMemberScope().changeLockLevel(WritableScope.LockLevel.READING); - return actualPackage; - } - - private static Map serializeClasses( - DescriptorSerializer serializer, - Collection allDescriptors - ) { - final Map classProtos = Maps.newHashMap(); - ClassSerializationUtil.serializeClasses(allDescriptors, serializer, new ClassSerializationUtil.Sink() { - @Override - public void writeClass( - @NotNull ClassDescriptor classDescriptor, @NotNull ProtoBuf.Class classProto - ) { - classProtos.put(ClassSerializationUtil.getClassId(classDescriptor), classProto); - } - }); - return classProtos; - } - - private static List serializeCallables( - DescriptorSerializer serializer, - Collection allDescriptors - ) { - List callableProtos = Lists.newArrayList(); - for (DeclarationDescriptor descriptor : allDescriptors) { - if (descriptor instanceof CallableMemberDescriptor) { - CallableMemberDescriptor callableMemberDescriptor = (CallableMemberDescriptor) descriptor; - callableProtos.add(serializer.callableProto(callableMemberDescriptor).build()); - } - } - return callableProtos; - } - - private static void deserializeCallables( - List callableProtos, - MutablePackageFragmentDescriptor actualPackage, - NameResolver nameResolver, - DescriptorFinder descriptorFinder - ) { - DescriptorDeserializer descriptorDeserializer = - DescriptorDeserializer.create(new LockBasedStorageManager(), actualPackage, nameResolver, descriptorFinder, AnnotationDeserializer.UNSUPPORTED); - for (ProtoBuf.Callable callableProto : callableProtos) { - CallableMemberDescriptor callableMemberDescriptor = descriptorDeserializer.loadCallable(callableProto); - if (callableMemberDescriptor instanceof PropertyDescriptor) { - PropertyDescriptor propertyDescriptor = (PropertyDescriptor) callableMemberDescriptor; - actualPackage.getMemberScope().addPropertyDescriptor(propertyDescriptor); - } - else if (callableMemberDescriptor instanceof FunctionDescriptor) { - FunctionDescriptor functionDescriptor = (FunctionDescriptor) callableMemberDescriptor; - actualPackage.getMemberScope().addFunctionDescriptor(functionDescriptor); - } - } - } -} diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java new file mode 100644 index 00000000000..85c3b503765 --- /dev/null +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java @@ -0,0 +1,56 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.descriptors.serialization; + +import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.jet.TestJdkKind; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.jet.jvm.compiler.ExpectedLoadErrorsUtil; +import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; +import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; + +import java.io.File; +import java.util.Arrays; + +public class LoadBuiltinsTest extends KotlinTestWithEnvironment { + @Override + protected JetCoreEnvironment createEnvironment() { + return createEnvironmentWithJdk(ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.FULL_JDK); + } + + public void testBuiltIns() throws Exception { + RecursiveDescriptorComparator.Configuration configuration = RecursiveDescriptorComparator.RECURSIVE_ALL.withRenderer( + new DescriptorRendererBuilder() + .setWithDefinedIn(false) + .setExcludedAnnotationClasses(Arrays.asList(new FqName(ExpectedLoadErrorsUtil.ANNOTATION_CLASS_NAME))) + .setOverrideRenderingPolicy(DescriptorRenderer.OverrideRenderingPolicy.RENDER_OPEN_OVERRIDE) + .setVerbose(true) + .setAlwaysRenderAny(true) // TODO is it needed? + .setPrettyFunctionTypes(false) // TODO is it needed? + .build() + ); + + PackageFragmentDescriptor actualFragment = KotlinBuiltIns.getInstance().getBuiltInsPackageFragment(); + RecursiveDescriptorComparator + .validateAndCompareDescriptorWithFile(actualFragment, configuration, new File("compiler/testData/builtin-classes.txt")); + } +} diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java deleted file mode 100644 index 82d48f78b0a..00000000000 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.resolve.lazy; - -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; - -import java.io.File; - -import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.RECURSIVE_ALL; -import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile; - -public class LazyResolveBuiltinClassesTest extends KotlinTestWithEnvironment { - @Override - protected JetCoreEnvironment createEnvironment() { - return createEnvironmentWithMockJdk(ConfigurationKind.JDK_ONLY); - } - - public void testBuiltIns() throws Exception { - PackageFragmentDescriptor builtInsPackage = KotlinBuiltIns.getInstance().getBuiltInsPackageFragment(); - validateAndCompareDescriptorWithFile(builtInsPackage, RECURSIVE_ALL, new File("compiler/testData/builtin-classes.txt")); - } -}