azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better comparison of vararg signatures in Read*BinaryClassTest

Browse Source
This commit is contained in:
Stepan Koltsov
2012-05-12 22:28:39 +04:00
parent f061fce9a8
commit ae58c1c888
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
open class test.VarargInt : java.lang.Object { open class test.VarargInt : java.lang.Object {
final /*constructor*/ fun <init>(): test.VarargInt final /*constructor*/ fun <init>(): test.VarargInt
open fun vararg(/*0*/ vararg p0: jet.Int): jet.Tuple0 open fun vararg(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Tuple0
} }
compiler/testData/readJavaBinaryClass/vararg/VarargString.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
open class test.VarargString : java.lang.Object { open class test.VarargString : java.lang.Object {
final /*constructor*/ fun <init>(): test.VarargString final /*constructor*/ fun <init>(): test.VarargString
open fun vararg(/*0*/ vararg p0: jet.String?): jet.Tuple0 open fun vararg(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
} }
compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test namespace test
final fun </*0,r*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P): jet.Int final fun </*0,r*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int
compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test 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
compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test 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<java.lang.Integer>*/): jet.Int
compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java
+3
View File
@@ -301,6 +301,9 @@ class NamespaceComparator {
sb.append(": "); sb.append(": ");
if (valueParameter.getVarargElementType() != null) { if (valueParameter.getVarargElementType() != null) {
new TypeSerializer(sb).serialize(valueParameter.getVarargElementType()); new TypeSerializer(sb).serialize(valueParameter.getVarargElementType());
sb.append(" /*");
new TypeSerializer(sb).serialize(valueParameter.getType());
sb.append("*/");
} }
else { else {
new TypeSerializer(sb).serialize(valueParameter.getType()); new TypeSerializer(sb).serialize(valueParameter.getType());