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

Minor reformatting.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-21 18:17:37 +04:00
parent 6f8f62cc9a
commit 9044ec775f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java
+6 -3
View File
@@ -161,7 +161,8 @@ class AlternativeSignatureData {
if (arguments.size() != type.getTypeArgumentsAsTypes().size()) { if (arguments.size() != type.getTypeArgumentsAsTypes().size()) {
fail("'%s' type in method signature has %d type arguments, while '%s' in alternative signature has %d of them", fail("'%s' type in method signature has %d type arguments, while '%s' in alternative signature has %d of them",
DescriptorRenderer.TEXT.renderType(autoType), arguments.size(), type.getText(), type.getTypeArgumentsAsTypes().size()); DescriptorRenderer.TEXT.renderType(autoType), arguments.size(), type.getText(),
type.getTypeArgumentsAsTypes().size());
} }
List<TypeProjection> altArguments = new ArrayList<TypeProjection>(); List<TypeProjection> altArguments = new ArrayList<TypeProjection>();
@@ -291,7 +292,8 @@ class AlternativeSignatureData {
} }
} }
else { else {
altTypeElement = findTypeParameterConstraint(altFunDeclaration, parameter.getNameAsName(), upperBoundIndex).getBoundTypeReference().getTypeElement(); altTypeElement = findTypeParameterConstraint(altFunDeclaration, parameter.getNameAsName(), upperBoundIndex)
.getBoundTypeReference().getTypeElement();
} }
altParamDescriptor.addUpperBound(computeType(altTypeElement, upperBound)); altParamDescriptor.addUpperBound(computeType(altTypeElement, upperBound));
upperBoundIndex++; upperBoundIndex++;
@@ -303,7 +305,8 @@ class AlternativeSignatureData {
} }
@Nullable @Nullable
private static JetTypeConstraint findTypeParameterConstraint(@NotNull JetFunction function, @NotNull Name typeParameterName, int index) { private static JetTypeConstraint findTypeParameterConstraint(@NotNull JetFunction function, @NotNull Name typeParameterName,
int index) {
if (index != 0) { if (index != 0) {
int currentIndex = 0; int currentIndex = 0;
for (JetTypeConstraint constraint : function.getTypeConstraints()) { for (JetTypeConstraint constraint : function.getTypeConstraints()) {