From 921b601628fd49a3beb02524b904311af59de223 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Thu, 22 Mar 2012 03:46:46 +0400
Subject: [PATCH] fix serialization of types in Read*BinaryClassTest

---
 .../readJavaBinaryClass/ClassWithTypeP.txt    |  2 +-
 .../readJavaBinaryClass/ClassWithTypePP.txt   |  2 +-
 .../ClassWithTypePRefSelf.txt                 |  2 +-
 .../InnerClassReferencesOuterTP.txt           |  4 +-
 .../MethodReferencesOuterClassTP.txt          |  2 +-
 .../MethodWithTypePRefClassP.txt              |  2 +-
 .../javaBean/JavaBeanVarOfGenericType.txt     |  4 +-
 .../class/ClassInParam.txt                    |  2 +-
 .../class/ClassOutParam.txt                   |  2 +-
 .../class/ClassParam.txt                      |  2 +-
 .../class/ClassParamReferencesParam.txt       |  2 +-
 .../class/ClassParamReferencesParam2.txt      |  2 +-
 .../class/ClassParamReferencesSelf.txt        |  2 +-
 .../class/ClassParamUpperClassBound.txt       |  2 +-
 .../ClassParamUpperClassInterfaceBound.txt    |  2 +-
 .../class/ClassParamUpperInterfaceBound.txt   |  2 +-
 .../ClassParamUpperInterfaceClassBound.txt    |  2 +-
 .../class/ClassTwoParams.txt                  |  2 +-
 .../class/ClassTwoParams2.txt                 |  2 +-
 .../class/InheritClassWithParam.txt           |  2 +-
 .../classFun/ClassInParamUsedInFun.txt        |  2 +-
 .../classFun/ClassParamUsedInFun.txt          |  2 +-
 .../classFun/FunInParamSuper.txt              |  4 +-
 .../ConstructorWithTwoTypeParameters.txt      |  2 +-
 ...oTypeParametersAndOneIntValueParameter.txt |  2 +-
 ...TwoTypeParametersAndOnePValueParameter.txt |  2 +-
 .../ConstructorWithTypeParameter.txt          |  2 +-
 ...thTypeParametersEAndOnePValueParameter.txt |  2 +-
 .../prop/ExtValClass.txt                      |  2 +-
 .../prop/ExtValIntTInClass.txt                |  4 +-
 .../prop/ExtValIntTQInClass.txt               |  4 +-
 .../prop/ExtValTIntInClass.txt                |  4 +-
 .../prop/ExtVarClass.txt                      |  2 +-
 .../prop/ExtVarIntTInClass.txt                |  4 +-
 .../prop/ExtVarIntTQInClass.txt               |  4 +-
 .../prop/ExtVarMapPQInt.txt                   |  2 +-
 .../prop/ExtVarTIntInClass.txt                |  4 +-
 .../prop/ExtVarTQIntInClass.txt               |  4 +-
 .../jet/compiler/NamespaceComparator.java     | 91 +++++++++----------
 39 files changed, 92 insertions(+), 95 deletions(-)

diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
index d9abe09d3f2..53703ad2b25 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
@@ -1,5 +1,5 @@
 namespace test
 
 final class test.ClassWithTypeParameter</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypeParameter</*0*/ P : jet.Any?>
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypeParameter<P>
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
index 1d1203ffc98..006e0c79287 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
@@ -1,5 +1,5 @@
 namespace test
 
 final class test.ClassWithTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : P> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : P><init>(): test.ClassWithTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : P>
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : P><init>(): test.ClassWithTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
index 9cb3ef6af83..cdb05477131 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
@@ -1,5 +1,5 @@
 namespace test
 
 final class test.ClassWithTypePRefSelf</*0*/ P : java.lang.Enum<P>?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : java.lang.Enum<P>?><init>(): test.ClassWithTypePRefSelf</*0*/ P : java.lang.Enum<P>?>
+    final /*constructor*/ fun </*0*/ P : java.lang.Enum<P>?><init>(): test.ClassWithTypePRefSelf<P>
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
index 5d3c90efeef..7de0bb8958b 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
+++ b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
@@ -1,8 +1,8 @@
 namespace test
 
 open class test.Outer</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer</*0*/ P : jet.Any?>
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer<P>
     open class test.Outer.Inner</*0*/ Q : P> : jet.Any {
-        final /*constructor*/ fun </*0*/ Q : P><init>(): test.Outer.Inner</*0*/ Q : P>
+        final /*constructor*/ fun </*0*/ Q : P><init>(): test.Outer.Inner<Q>
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
index 5255619fb4c..f05d0b04286 100644
--- a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
+++ b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
@@ -1,7 +1,7 @@
 namespace test
 
 final class test.Outer</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer</*0*/ P : jet.Any?>
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer<P>
     final class test.Outer.Inner : jet.Any {
         final /*constructor*/ fun <init>(): test.Outer.Inner
         final fun </*0*/ Q : P>f(): jet.Tuple0
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
index 12c852f8b42..6cbf0d00a27 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
@@ -1,6 +1,6 @@
 namespace test
 
 open class test.MethodWithTypePRefClassP</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodWithTypePRefClassP</*0*/ P : jet.Any?>
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodWithTypePRefClassP<P>
     final fun </*0*/ Q : P>f(): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
index d6cda384e3c..e11bab1f3b7 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
@@ -1,7 +1,7 @@
 namespace test
 
 open class test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?>
-    open fun getCharacters(): java.util.ArrayList</*0*/ P : jet.Any?>?
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.JavaBeanVarOfGenericType<P>
+    open fun getCharacters(): java.util.ArrayList<P>?
     open fun setCharacters(/*0*/ p0: java.util.ArrayList<P>?): jet.Tuple0
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
index 964689a49e7..10627790a4c 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
@@ -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</*0,r*/ in T : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.Wine<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
index 213fbfd6a69..9e3b37fb7b0 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
@@ -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</*0,r*/ in T : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.Juice<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
index 3ba861bf9a1..74070a4dcc3 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
@@ -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</*0,r*/ T : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Beer<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
index c03192a19bd..a1eaafe670f 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
@@ -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</*0,r*/ A : jet.Any?, /*1,r*/ B : A>
+    final /*constructor*/ fun </*0,r*/ A : jet.Any?, /*1,r*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
index 78c2af21bae..36d215de552 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
@@ -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</*0,r*/ A : jet.Any?, /*1,r*/ in B : A>
+    final /*constructor*/ fun </*0,r*/ A : jet.Any?, /*1,r*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
index 78c19781123..970840a57c1 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
@@ -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</*0,r*/ A : test.TraitWithP<A>>
+    final /*constructor*/ fun </*0,r*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
 }
 abstract trait test.TraitWithP</*0,r*/ P : jet.Any?> : jet.Any {
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
index bb5c286bdd5..2d510acbce4 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
@@ -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</*0,r*/ A : java.lang.Number>
+    final /*constructor*/ fun </*0,r*/ A : java.lang.Number><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
index 78aea4bac30..d5303d9f25e 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
@@ -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</*0,r*/ A : java.io.Serializable & java.lang.Number>
+    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
index c6ef12f9a08..5bec0b29a21 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
@@ -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</*0,r*/ A : java.io.Serializable>
+    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
index 78aea4bac30..d5303d9f25e 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
@@ -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</*0,r*/ A : java.io.Serializable & java.lang.Number>
+    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
index 6b104a8df3c..20cca2bc513 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
@@ -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</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
index 69b5df0d7b0..31025206da0 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
@@ -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</*0,r*/ out P : jet.Any?, /*1,r*/ Q : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ out P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt b/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
index 6603584e8d0..a3f5859557f 100644
--- a/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
@@ -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</*0,r*/ P : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.Aaa<P>
 }
 final class test.Bbb : test.Aaa<java.util.Random> {
     final /*constructor*/ fun <init>(): test.Bbb
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
index 3f0cb8dac8b..e50215a6338 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
@@ -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</*0,r*/ in T : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
     final fun f(/*0*/ t: T): jet.Int
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
index a4f8566cc48..e2d3f4eb7f7 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
@@ -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</*0,r*/ T : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
     final fun f(/*0*/ t: T): jet.Int
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt b/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
index df7cca656c2..7fd3b70c31a 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
@@ -5,6 +5,6 @@ final class test.Inh : test.Base<jet.String> {
     final override /*1*/ fun foo(): jet.String
 }
 open class test.Base</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Base</*0,r*/ T : jet.Any?>
-    final fun foo(): /*0,r*/ T : jet.Any?
+    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Base<T>
+    final fun foo(): T
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
index 8a998f1cd1e..ae6ca429b09 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
@@ -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</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
index a5d780ab595..07cf90c07c7 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
@@ -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</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
index 168a1716755..4465d8b18fa 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
@@ -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</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
index ae18a907292..9d28aaae785 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
@@ -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</*0,r*/ P : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
index b798a98d321..cb08f2cd59b 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
@@ -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</*0,r*/ P : jet.Any?, /*1*/ Q : jet.Any?>
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
index 69f221a31e6..54d4bc45468 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final val  </*0,r*/ P : jet.Any?> /*0,r*/ P : jet.Any?.anotherJavaClass: java.lang.Class</*0,r*/ P : jet.Any?>
+final val  </*0,r*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
index 4eecb24bce0..302bcb6e5e4 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
@@ -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</*0,r*/ T : jet.Any?>
-    final val jet.Int.asas: /*0,r*/ T : jet.Any?
+    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.ExtValInClass<T>
+    final val jet.Int.asas: T
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
index f513cf7de72..c5dee1e351f 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
@@ -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</*0,r*/ P : jet.Any?>
-    final val jet.Int.asas: /*0,r*/ P : jet.Any??
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+    final val jet.Int.asas: P?
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
index 2b64a49ffed..9f9c0b26840 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
@@ -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</*0,r*/ P : jet.Any?>
-    final val /*0,r*/ P : jet.Any?.asas: jet.Int
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+    final val P.asas: jet.Int
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
index e37a3e8283b..c405827637a 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final var  </*0,r*/ P : jet.Any?> /*0,r*/ P : jet.Any?.anotherJavaClass: java.lang.Class</*0,r*/ P : jet.Any?>
+final var  </*0,r*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
index 23d1ddf4bed..1f251498a10 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
@@ -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</*0,r*/ P : jet.Any?>
-    final var jet.Int.asas: /*0,r*/ P : jet.Any?
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+    final var jet.Int.asas: P
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
index f1c0c561dd7..359026c08f5 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
@@ -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</*0,r*/ P : jet.Any?>
-    final var jet.Int.asas: /*0,r*/ P : jet.Any??
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+    final var jet.Int.asas: P?
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
index 2cac6e43ed1..268fcb85b5a 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final var  </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> java.util.Map</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>.asas: jet.Int
+final var  </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
index affa20021a7..1755a95d6cb 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
@@ -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</*0,r*/ P : jet.Any?>
-    final var /*0,r*/ P : jet.Any?.asas: jet.Int
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+    final var P.asas: jet.Int
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
index 67f7d634791..5c724414ea0 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
@@ -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</*0,r*/ P : jet.Any?>
-    final var /*0,r*/ P : jet.Any??.asas: jet.Int
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+    final var P?.asas: jet.Int
 }
diff --git a/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
index f4cb3cc1536..8f6da0fd7af 100644
--- a/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
@@ -43,10 +43,7 @@ import org.jetbrains.jet.lang.types.TypeProjection;
 import org.jetbrains.jet.lang.types.Variance;
 import org.junit.Assert;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
+import java.io.*;
 import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -263,15 +260,15 @@ class NamespaceComparator {
             }
 
             if (fun.getReceiverParameter().exists()) {
-                new Serializer(sb).serialize(fun.getReceiverParameter());
+                new TypeSerializer(sb).serialize(fun.getReceiverParameter());
                 sb.append(".");
             }
 
             sb.append(fun.getName());
             sb.append("(");
-            new ValueParameterSerializer(sb).serializeCommaSeparated(fun.getValueParameters());
+            new TypeSerializer(sb).serializeCommaSeparated(fun.getValueParameters());
             sb.append("): ");
-            new Serializer(sb).serialize(fun.getReturnType());
+            new TypeSerializer(sb).serialize(fun.getReturnType());
         }
 
         public void serialize(ExtensionReceiver extensionReceiver) {
@@ -298,13 +295,12 @@ class NamespaceComparator {
                 sb.append("> ");
             }
             if (prop.getReceiverParameter().exists()) {
-                // TODO: print only name for type parameter
-                new Serializer(sb).serialize(prop.getReceiverParameter().getType());
+                new TypeSerializer(sb).serialize(prop.getReceiverParameter().getType());
                 sb.append(".");
             }
             sb.append(prop.getName());
             sb.append(": ");
-            new Serializer(sb).serialize(prop.getType());
+            new TypeSerializer(sb).serialize(prop.getType());
         }
 
         public void serialize(ValueParameterDescriptor valueParameter) {
@@ -317,9 +313,9 @@ class NamespaceComparator {
             sb.append(valueParameter.getName());
             sb.append(": ");
             if (valueParameter.getVarargElementType() != null) {
-                serialize(valueParameter.getVarargElementType());
+                new TypeSerializer(sb).serialize(valueParameter.getVarargElementType());
             } else {
-                serialize(valueParameter.getType());
+                new TypeSerializer(sb).serialize(valueParameter.getType());
             }
             if (valueParameter.hasDefaultValue()) {
                 sb.append(" = ?");
@@ -339,28 +335,8 @@ class NamespaceComparator {
             sb.append(modality.name().toLowerCase());
         }
 
-        public void serialize(@NotNull JetType type) {
-            serialize(type.getConstructor().getDeclarationDescriptor());
-            if (!type.getArguments().isEmpty()) {
-                sb.append("<");
-                boolean first = true;
-                for (TypeProjection proj : type.getArguments()) {
-                    if (!first) {
-                        sb.append(", ");
-                    }
-                    serialize(proj.getProjectionKind());
-                    serialize(proj.getType());
-                    first = false;
-                }
-                sb.append(">");
-            }
-            if (type.isNullable()) {
-                sb.append("?");
-            }
-        }
-
         public void serialize(AnnotationDescriptor annotation) {
-            serialize(annotation.getType());
+            new TypeSerializer(sb).serialize(annotation.getType());
             sb.append("(");
             serializeCommaSeparated(annotation.getValueArguments());
             sb.append(")");
@@ -436,7 +412,7 @@ class NamespaceComparator {
                 List<String> list = new ArrayList<String>();
                 for (JetType upper : param.getUpperBounds()) {
                     StringBuilder sb = new StringBuilder();
-                    new ValueParameterSerializer(sb).serialize(upper);
+                    new TypeSerializer(sb).serialize(upper);
                     list.add(sb.toString());
                 }
                 Collections.sort(list);
@@ -446,6 +422,39 @@ class NamespaceComparator {
         }
 
     }
+    
+    private static class TypeSerializer extends Serializer {
+
+        public TypeSerializer(StringBuilder sb) {
+            super(sb);
+        }
+
+        @Override
+        public void serialize(TypeParameterDescriptor param) {
+            sb.append(param.getName());
+        }
+
+        public void serialize(@NotNull JetType type) {
+            serialize(type.getConstructor().getDeclarationDescriptor());
+            if (!type.getArguments().isEmpty()) {
+                sb.append("<");
+                boolean first = true;
+                for (TypeProjection proj : type.getArguments()) {
+                    if (!first) {
+                        sb.append(", ");
+                    }
+                    serialize(proj.getProjectionKind());
+                    serialize(proj.getType());
+                    first = false;
+                }
+                sb.append(">");
+            }
+            if (type.isNullable()) {
+                sb.append("?");
+            }
+        }
+
+    }
 
     private static boolean isRootNs(DeclarationDescriptor ns) {
         // upyachka
@@ -474,18 +483,6 @@ class NamespaceComparator {
         }
     }
 
-    private static class ValueParameterSerializer extends Serializer {
-
-        public ValueParameterSerializer(StringBuilder sb) {
-            super(sb);
-        }
-
-        @Override
-        public void serialize(TypeParameterDescriptor param) {
-            sb.append(param.getName());
-        }
-    }
-
     private class FullContentSerialier extends Serializer {
         private FullContentSerialier(StringBuilder sb) {
             super(sb);
@@ -513,7 +510,7 @@ class NamespaceComparator {
 
             if (!klass.getTypeConstructor().getSupertypes().isEmpty()) {
                 sb.append(" : ");
-                new Serializer(sb).serializeCommaSeparated(new ArrayList<JetType>(klass.getTypeConstructor().getSupertypes()));
+                new TypeSerializer(sb).serializeCommaSeparated(new ArrayList<JetType>(klass.getTypeConstructor().getSupertypes()));
             }
 
             sb.append(" {\n");