From ae58c1c888cb138c9718951245bfc77cbd95c8a6 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Sat, 12 May 2012 22:28:39 +0400 Subject: [PATCH] better comparison of vararg signatures in Read*BinaryClassTest --- compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt | 2 +- compiler/testData/readJavaBinaryClass/vararg/VarargString.txt | 2 +- .../fun/genericWithTypeVariables/FunParamVaragParam.txt | 2 +- .../readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt | 2 +- .../readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt | 2 +- .../jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java | 3 +++ 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt b/compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt index 11a443c40e6..5525c0e14eb 100644 --- a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt +++ b/compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt @@ -2,5 +2,5 @@ namespace test open class test.VarargInt : java.lang.Object { final /*constructor*/ fun (): test.VarargInt - open fun vararg(/*0*/ vararg p0: jet.Int): jet.Tuple0 + open fun vararg(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Tuple0 } diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargString.txt b/compiler/testData/readJavaBinaryClass/vararg/VarargString.txt index 92fc0f8aefb..aba7afbd75c 100644 --- a/compiler/testData/readJavaBinaryClass/vararg/VarargString.txt +++ b/compiler/testData/readJavaBinaryClass/vararg/VarargString.txt @@ -2,5 +2,5 @@ namespace test open class test.VarargString : java.lang.Object { final /*constructor*/ fun (): test.VarargString - open fun vararg(/*0*/ vararg p0: jet.String?): jet.Tuple0 + open fun vararg(/*0*/ vararg p0: jet.String? /*jet.Array*/): jet.Tuple0 } diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt index 1ff6ab73562..5c78758960e 100644 --- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt +++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt @@ -1,3 +1,3 @@ namespace test -final fun funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P): jet.Int +final fun funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array

*/): jet.Int diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt index 6742e75d737..42fe439fda6 100644 --- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt +++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt @@ -1,3 +1,3 @@ namespace test -final fun varargInt(/*0*/ a: jet.Int, /*1*/ vararg b: jet.Int): jet.Int +final fun varargInt(/*0*/ a: jet.Int, /*1*/ vararg b: jet.Int /*jet.IntArray*/): jet.Int diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt index 7777a8d1b19..03d714cf260 100644 --- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt +++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt @@ -1,3 +1,3 @@ namespace test -final fun varargCharSequence(/*0*/ a: jet.Int, /*1*/ vararg b: java.lang.Integer): jet.Int +final fun varargCharSequence(/*0*/ a: jet.Int, /*1*/ vararg b: java.lang.Integer /*jet.Array*/): jet.Int diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java index 3ee445add52..4cacf76cf53 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java +++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java @@ -301,6 +301,9 @@ class NamespaceComparator { sb.append(": "); if (valueParameter.getVarargElementType() != null) { new TypeSerializer(sb).serialize(valueParameter.getVarargElementType()); + sb.append(" /*"); + new TypeSerializer(sb).serialize(valueParameter.getType()); + sb.append("*/"); } else { new TypeSerializer(sb).serialize(valueParameter.getType());