Introduce 'reified' instead of 'erased'

2012-06-05 20:05:35 +04:00
parent 0ceee0a383
commit 91606a3901
98 changed files with 158 additions and 157 deletions
@@ -2,7 +2,7 @@ package jet

 public fun arrayOfNulls<T>(public val size : Int) : Array<T?>

-public class Array<T>(public val size : Int, init : (Int) -> T) {
+public class Array<reified T>(public val size : Int, init : (Int) -> T) {
  public fun get(index : Int) : T
  public fun set(index : Int, value : T) : Unit

@@ -82,7 +82,7 @@ public class DescriptorResolver {
            TypeParameterDescriptor typeParameterDescriptor = TypeParameterDescriptorImpl.createForFurtherModification(
                    descriptor,
                    annotationResolver.createAnnotationStubs(typeParameter.getModifierList(), trace),
-                    !typeParameter.hasModifier(JetTokens.ERASED_KEYWORD),
+                    typeParameter.hasModifier(JetTokens.REIFIED_KEYWORD),
                    typeParameter.getVariance(),
                    JetPsiUtil.safeName(typeParameter.getName()),
                    index
@@ -335,7 +335,7 @@ public class DescriptorResolver {
        TypeParameterDescriptorImpl typeParameterDescriptor = TypeParameterDescriptorImpl.createForFurtherModification(
                containingDescriptor,
                annotationResolver.createAnnotationStubs(typeParameter.getModifierList(), trace),
-                !typeParameter.hasModifier(JetTokens.ERASED_KEYWORD),
+                typeParameter.hasModifier(JetTokens.REIFIED_KEYWORD),
                typeParameter.getVariance(),
                JetPsiUtil.safeName(typeParameter.getName()),
                index
@@ -157,7 +157,7 @@ public interface JetTokens {
    JetKeywordToken OUT_KEYWORD       = JetKeywordToken.softKeyword("out");
    JetKeywordToken VARARG_KEYWORD       = JetKeywordToken.softKeyword("vararg");
    JetKeywordToken INLINE_KEYWORD       = JetKeywordToken.softKeyword("inline");
-    JetKeywordToken ERASED_KEYWORD       = JetKeywordToken.softKeyword("erased");
+    JetKeywordToken REIFIED_KEYWORD = JetKeywordToken.softKeyword("reified");

    JetKeywordToken FINALLY_KEYWORD   = JetKeywordToken.softKeyword("finally");
    JetKeywordToken FINAL_KEYWORD   = JetKeywordToken.softKeyword("final");
@@ -174,12 +174,12 @@ public interface JetTokens {
    TokenSet SOFT_KEYWORDS = TokenSet.create(IMPORT_KEYWORD, WHERE_KEYWORD, BY_KEYWORD, GET_KEYWORD,
            SET_KEYWORD, ABSTRACT_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, ANNOTATION_KEYWORD,
            OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD,
-            CATCH_KEYWORD, FINALLY_KEYWORD, OUT_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD, ERASED_KEYWORD
+            CATCH_KEYWORD, FINALLY_KEYWORD, OUT_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD, REIFIED_KEYWORD
    );

    TokenSet MODIFIER_KEYWORDS = TokenSet.create(ABSTRACT_KEYWORD, ENUM_KEYWORD,
            OPEN_KEYWORD, ANNOTATION_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD,
-            PROTECTED_KEYWORD, OUT_KEYWORD, IN_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD, ERASED_KEYWORD
+            PROTECTED_KEYWORD, OUT_KEYWORD, IN_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD, REIFIED_KEYWORD
    );
    TokenSet WHITE_SPACE_OR_COMMENT_BIT_SET = TokenSet.create(WHITE_SPACE, BLOCK_COMMENT, EOL_COMMENT, DOC_COMMENT, SHEBANG_COMMENT);
    TokenSet WHITESPACES = TokenSet.create(TokenType.WHITE_SPACE);
@@ -553,14 +553,14 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
        }

        protected void renderTypeParameter(TypeParameterDescriptor descriptor, StringBuilder builder, boolean topLevel) {
-            if (descriptor.isReified()) {
+            if (!descriptor.isReified()) {
                String variance = descriptor.getVariance().toString();
                if (!variance.isEmpty()) {
                    builder.append(renderKeyword(variance)).append(" ");
                }
            }
            else {
-                builder.append(renderKeyword("erased")).append(" ");
+                builder.append(renderKeyword("reified")).append(" ");
            }
            renderName(descriptor, builder);
            if (descriptor.getUpperBounds().size() == 1) {
@@ -1,4 +1,4 @@
-fun <erased T : Any> T?.iterator() = object {
+fun <T : Any> T?.iterator() = object {
    var hasNext = this@iterator != null
      private set

@@ -1 +1,2 @@
 fun box() = if(arrayOfNulls<Int>(10) is Array<java.lang.Integer>) "OK" else "fail"
+
@@ -3,7 +3,7 @@ class Box<T>(t: T) {
 }

 fun isIntBox(box: Box<out Any?>): Boolean {
-    return box is Box<Int>;
+    return box is Box<*>;
 }


@@ -1,3 +1,3 @@
 class MyList<T>

-fun ff(a: Any) = a is MyList<String>
+fun ff(a: Any) = a is <!CANNOT_CHECK_FOR_ERASED!>MyList<String><!>
@@ -2,7 +2,7 @@
 package kt1189
 import java.util.concurrent.locks.ReentrantReadWriteLock

-inline fun <erased T> ReentrantReadWriteLock.write(action: ()->T) : T {
+inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
    val rl = readLock().sure()
    var readCount = 0
    val writeCount = getWriteHoldCount()
@@ -7,7 +7,7 @@ trait FunctionalList<T> {
    val tail: FunctionalList<T>
 }

-fun <erased T> FunctionalList<T>.plus(element: T) : FunctionalList<T> = object: FunctionalList<T> {
+fun <T> FunctionalList<T>.plus(element: T) : FunctionalList<T> = object: FunctionalList<T> {
    override val size: Int
    get() = 1 + this@plus.size
    override val tail: FunctionalList<T>
@@ -1,4 +1,4 @@
 package test

-class ClassWithTypeParameter<erased P>() : java.lang.Object() {
+class ClassWithTypeParameter<P>() : java.lang.Object() {
 }
@@ -1,4 +1,4 @@
 package test

-abstract class ClassTypeTypePRefSuper<erased P>() : java.lang.Iterable<P> {
+abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> {
 }
@@ -1,4 +1,4 @@
 package test

-class ClassWithTypeParameter<erased P, erased Q : P>() : java.lang.Object() {
+class ClassWithTypeParameter<P, Q : P>() : java.lang.Object() {
 }
@@ -1,5 +1,5 @@
 package test

-trait Foo<erased Q> : java.lang.Object
+trait Foo<Q> : java.lang.Object

-open class ClassWithTypePRefNext<erased R : Foo<P>?, erased P>() : java.lang.Object()
+open class ClassWithTypePRefNext<R : Foo<P>?, P>() : java.lang.Object()
@@ -1,4 +1,4 @@
 package test

-class ClassWithTypePRefSelf<erased P : java.lang.Enum<P>?>() : java.lang.Object() {
+class ClassWithTypePRefSelf<P : java.lang.Enum<P>?>() : java.lang.Object() {
 }
@@ -1,5 +1,5 @@
 package test

-open class Outer<erased P>() : java.lang.Object() {
-    open class Inner<erased Q : P>() : java.lang.Object()
+open class Outer<P>() : java.lang.Object() {
+    open class Inner<Q : P>() : java.lang.Object()
 }
@@ -1,8 +1,8 @@
 package test

-trait Trait<erased P> : java.lang.Object
+trait Trait<P> : java.lang.Object

-open class Outer<erased P, erased Q>() : java.lang.Object() {
+open class Outer<P, Q>() : java.lang.Object() {
    open class Inner() : java.lang.Object() {
    }
    
@@ -1,7 +1,7 @@
 package test

-class Outer<erased P>() : java.lang.Object() {
+class Outer<P>() : java.lang.Object() {
    class Inner() : java.lang.Object() {
-        fun f<erased Q : P>() {}
+        fun f<Q : P>() {}
    }
 }
@@ -3,5 +3,5 @@ package test
 trait Foo : java.lang.Object

 open class MethodTypePOneUpperBound() : java.lang.Object() {
-    open fun <erased T : Foo?> bar() = #()
+    open fun <T : Foo?> bar() = #()
 }
@@ -4,7 +4,7 @@ trait Foo : java.lang.Object
 trait Bar : java.lang.Object

 open class MethodTypePTwoUpperBounds() : java.lang.Object() {
-    open fun <erased T> foo(): Unit
+    open fun <T> foo(): Unit
        where T : Foo?, T : Bar?
    {}
 }
@@ -1,5 +1,5 @@
 package test

 class MethodWithTypeP() : java.lang.Object() {
-    fun <erased P> f() = #()
+    fun <P> f() = #()
 }
@@ -1,5 +1,5 @@
 package test

 class MethodWithTypePP() : java.lang.Object() {
-    fun <erased P, erased Q : P> f() = #()
+    fun <P, Q : P> f() = #()
 }
@@ -1,5 +1,5 @@
 package test

-open class MethodWithTypePRefClassP<erased P>() : java.lang.Object() {
-    fun <erased Q : P> f() = #()
+open class MethodWithTypePRefClassP<P>() : java.lang.Object() {
+    fun <Q : P> f() = #()
 }
@@ -1,5 +1,5 @@
 package test

 final class MethosWithPRefTP() : java.lang.Object() {
-    fun <erased P> f(p0: P?) = #()
+    fun <P> f(p0: P?) = #()
 }
@@ -2,7 +2,7 @@ package test

 import java.util.ArrayList

-open class JavaBeanVarOfGenericType<erased P>() : java.lang.Object() {
+open class JavaBeanVarOfGenericType<P>() : java.lang.Object() {
    open fun getCharacters(): ArrayList<P>? = null
    open fun setCharacters(p0: ArrayList<P>?) { }
    //var characters: ArrayList<P>? = null
@@ -1,5 +1,5 @@
 namespace test

-final class test.Wine</*0,r*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.Wine<T>
+final class test.Wine</*0*/ in T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Wine<T>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.Juice</*0,r*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.Juice<T>
+final class test.Juice</*0*/ in T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Juice<T>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.Beer</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Beer<T>
+final class test.Beer</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Beer<T>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.ClassParamReferencesParam</*0,r*/ A : jet.Any?, /*1,r*/ B : A> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : jet.Any?, /*1,r*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
+final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ B : A> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.ClassParamReferencesParam</*0,r*/ A : jet.Any?, /*1,r*/ in B : A> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : jet.Any?, /*1,r*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
+final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ in B : A> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
 }
@@ -1,7 +1,7 @@
 namespace test

-final class test.ClassParamReferencesSelf</*0,r*/ A : test.TraitWithP<A>> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
+final class test.ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
 }
-abstract trait test.TraitWithP</*0,r*/ P : jet.Any?> : jet.Any {
+abstract trait test.TraitWithP</*0*/ P : jet.Any?> : jet.Any {
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.Clock</*0,r*/ A : java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.lang.Number><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.lang.Number> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.lang.Number><init>(): test.Clock<A>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.Clock</*0,r*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.Clock</*0,r*/ A : java.io.Serializable> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.io.Serializable> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.io.Serializable><init>(): test.Clock<A>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.Clock</*0,r*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.ClassTwoParams</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+final class test.ClassTwoParams</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.ClassTwoParams</*0,r*/ out P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ out P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+final class test.ClassTwoParams</*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }
@@ -1,7 +1,7 @@
 namespace test

-abstract class test.Aaa</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.Aaa<P>
+abstract class test.Aaa</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Aaa<P>
 }
 final class test.Bbb : test.Aaa<java.util.Random> {
    final /*constructor*/ fun <init>(): test.Bbb
@@ -1,6 +1,6 @@
 namespace test

-abstract trait test.Aaa</*0,r*/ P : jet.Any?> : jet.Any {
+abstract trait test.Aaa</*0*/ P : jet.Any?> : jet.Any {
 }
 final class test.Bbb : test.Aaa<java.util.Random> {
    final /*constructor*/ fun <init>(): test.Bbb
@@ -1,6 +1,6 @@
 namespace test

-final class test.ClassParamUsedInFun</*0,r*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
+final class test.ClassParamUsedInFun</*0*/ in T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
    final fun f(/*0*/ t: T): jet.Int
 }
@@ -1,6 +1,6 @@
 namespace test

-final class test.ClassParamUsedInFun</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
+final class test.ClassParamUsedInFun</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
    final fun f(/*0*/ t: T): jet.Int
 }
@@ -1,7 +1,7 @@
 namespace test

-open class test.Base</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Base<T>
+open class test.Base</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Base<T>
    final fun foo(): T
 }
 final class test.Inh : test.Base<jet.String> {
@@ -1,6 +1,6 @@
 namespace test

-abstract trait test.Bbb</*0,r*/ P : jet.Any?> : jet.Any {
+abstract trait test.Bbb</*0*/ P : jet.Any?> : jet.Any {
 }
 final class test.ClassObjectExtendsTraitWithTP : jet.Any {
    final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP
@@ -1,5 +1,5 @@
 namespace test

-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
@@ -1,5 +1,5 @@
 namespace test

-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
 }
@@ -1,3 +1,3 @@
 package test

-class OneTypeParameterErased<P, erased Q>(q: Q)
+class OneTypeParameterErased<P, Q>(q: Q)
@@ -1,5 +1,5 @@
 namespace test

-final class test.OneTypeParameterErased</*0,r*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
+final class test.OneTypeParameterErased</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
 }
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ T : jet.Any?>f(): jet.Int
+final fun </*0*/ T : jet.Any?>f(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ in T : jet.Any?>f(): jet.Int
+final fun </*0*/ in T : jet.Any?>f(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ out T : jet.Any?>f(): jet.Int
+final fun </*0*/ out T : jet.Any?>f(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
+final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
@@ -1,3 +1,3 @@
 package test

-fun <erased P> funParamParam(a: Int, b: P) = 1
+fun <P> funParamParam(a: Int, b: P) = 1
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : P>funParamReferencesParam(): jet.Int
+final fun </*0*/ P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ in P : jet.Any?, /*1,r*/ Q : P>funParamReferencesParam(): jet.Int
+final fun </*0*/ in P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int
@@ -4,4 +4,4 @@ abstract trait test.Bar : jet.Any {
 }
 abstract trait test.Foo : jet.Any {
 }
-final fun </*0,r*/ T : test.Bar & test.Foo>foo(): jet.Tuple0
+final fun </*0*/ T : test.Bar & test.Foo>foo(): jet.Tuple0
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ A : java.lang.Number>uno(): jet.Int
+final fun </*0*/ A : java.lang.Number>uno(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int
+final fun </*0*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ A : java.io.Serializable>dos(): jet.Int
+final fun </*0*/ A : java.io.Serializable>dos(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int
+final fun </*0*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int
+final fun </*0*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>funTwoTypeParams(): jet.Int
+final fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?>funTwoTypeParams(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final fun </*0,r*/ P : jet.Any?, /*1,r*/ in Q : jet.Any?>funTwoTypeParams(): jet.Int
+final fun </*0*/ P : jet.Any?, /*1*/ in Q : jet.Any?>funTwoTypeParams(): jet.Int
@@ -1,3 +1,3 @@
 namespace test

-final val  </*0,r*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+final val  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
@@ -1,6 +1,6 @@
 namespace test

-final class test.ExtValInClass</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.ExtValInClass<T>
+final class test.ExtValInClass</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ExtValInClass<T>
    final val jet.Int.asas: T
 }
@@ -1,6 +1,6 @@
 namespace test

-final class test.ExtValInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
    final val jet.Int.asas: P?
 }
@@ -1,6 +1,6 @@
 namespace test

-final class test.ExtValPIntInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
    final val P.asas: jet.Int
 }
@@ -1,3 +1,3 @@
 namespace test

-final var  </*0,r*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+final var  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
@@ -1,6 +1,6 @@
 namespace test

-final class test.ExtValInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
    final var jet.Int.asas: P
 }
@@ -1,6 +1,6 @@
 namespace test

-final class test.ExtValInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
    final var jet.Int.asas: P?
 }
@@ -1,3 +1,3 @@
 namespace test

-final var  </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int
+final var  </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int
@@ -1,6 +1,6 @@
 namespace test

-final class test.ExtValPIntInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
    final var P.asas: jet.Int
 }
@@ -1,6 +1,6 @@
 namespace test

-final class test.ExtValPIntInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
    final var P?.asas: jet.Int
 }
@@ -3,6 +3,6 @@ fun <P> foo(vararg tail: P) = 1
 // method: namespace::foo
 // jvm signature:     ([Ljava/lang/Object;)I
 // generic signature: <P:Ljava/lang/Object;>([TP;)I
-// kotlin signature:  <P:?Ljava/lang/Object;>([TP;)I
+// kotlin signature:  <erased P:?Ljava/lang/Object;>([TP;)I
 // TODO: skip kotlin signature
 // TODO: properly serialize typeinfo
				`@@ -1 +1,2 @@`
				`fun box() = if(arrayOfNulls<Int>(10) is Array<java.lang.Integer>) "OK" else "fail"`