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

Simplified signatures propagation for vararg types

Browse Source 
(do not change flexible types)
This commit is contained in:
Svetlana Isakova
2014-12-25 17:12:30 +03:00
parent 179c9ef2d6
commit d1556331ef
7 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
+2 -19
View File
@@ -368,34 +368,17 @@ public class SignaturesPropagationData {
return new VarargCheckResult(originalType, originalVarargElementType != null);
}
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
// todo simplify (with respect to platform types)
if (someSupersVararg && originalVarargElementType == null) {
// convert to vararg
assert isArrayType(originalType);
if (KotlinBuiltIns.isPrimitiveArray(originalType)) {
// replace IntArray? with IntArray
return new VarargCheckResult(TypeUtils.makeNotNullable(originalType), true);
}
// replace Array<out Foo>? with Array<Foo>
JetType varargElementType = builtIns.getArrayElementType(originalType);
return new VarargCheckResult(builtIns.getArrayType(INVARIANT, varargElementType), true);
return new VarargCheckResult(TypeUtils.makeNotNullable(originalType), true);
}
else if (someSupersNotVararg && originalVarargElementType != null) {
// convert to non-vararg
assert isArrayType(originalType);
if (KotlinBuiltIns.isPrimitiveArray(originalType)) {
// replace IntArray with IntArray?
return new VarargCheckResult(TypeUtils.makeNullable(originalType), false);
}
// replace Array<Foo> with Array<out Foo>?
return new VarargCheckResult(TypeUtils.makeNullable(builtIns.getArrayType(OUT_VARIANCE, originalVarargElementType)), false);
return new VarargCheckResult(TypeUtils.makeNullable(originalType), false);
}
return new VarargCheckResult(originalType, originalVarargElementType != null);
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
+1 -1
View File
@@ -4,7 +4,7 @@ public trait InheritNotVararg {
public trait Sub : test.InheritNotVararg.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.String!>?): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: (kotlin.Array<kotlin.String!>?..kotlin.Array<out kotlin.String!>?)): kotlin.Unit
}
public trait Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
+1 -1
View File
@@ -4,7 +4,7 @@ public trait InheritNotVarargInteger {
public trait Sub : test.InheritNotVarargInteger.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int!>?): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: (kotlin.Array<kotlin.Int!>?..kotlin.Array<out kotlin.Int!>?)): kotlin.Unit
}
public trait Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
+1 -1
View File
@@ -4,7 +4,7 @@ public trait InheritNotVarargNotNull {
public trait Sub : test.InheritNotVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<out kotlin.String!>?): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: (kotlin.Array<kotlin.String!>?..kotlin.Array<out kotlin.String!>?)): kotlin.Unit
}
public trait Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.txt
+1 -1
View File
@@ -4,7 +4,7 @@ public trait InheritVararg {
public trait Sub : test.InheritVararg.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<kotlin.String!>*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}
public trait Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
+1 -1
View File
@@ -4,7 +4,7 @@ public trait InheritVarargInteger {
public trait Sub : test.InheritVarargInteger.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int! /*kotlin.Array<kotlin.Int!>*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int! /*kotlin.Array<(out) kotlin.Int!>!*/): kotlin.Unit
}
public trait Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
+1 -1
View File
@@ -4,7 +4,7 @@ public trait InheritVarargNotNull {
public trait Sub : test.InheritVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<kotlin.String!>*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}
public trait Super {