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

Replaced indexed for loops with foreach.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-17 15:03:11 +04:00
parent 1a216c22f2
commit 7e56d6eed8
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java
+10 -12
View File
@@ -105,14 +105,14 @@ public class SignaturesPropagation {
// Modify type arguments using info from typesFromSuper // Modify type arguments using info from typesFromSuper
List<TypeProjection> resultArguments = Lists.newArrayList(); List<TypeProjection> resultArguments = Lists.newArrayList();
for (int i = 0; i < autoArguments.size(); i++) { for (TypeParameterDescriptor parameter : typeConstructor.getParameters()) {
TypeProjection argument = autoArguments.get(i); TypeProjection argument = autoArguments.get(parameter.getIndex());
TypeCheckingProcedure.EnrichedProjectionKind effectiveProjectionKind = TypeCheckingProcedure.EnrichedProjectionKind effectiveProjectionKind =
TypeCheckingProcedure.getEffectiveProjectionKind(typeConstructor.getParameters().get(i), argument); TypeCheckingProcedure.getEffectiveProjectionKind(parameter, argument);
JetType argumentType = argument.getType(); JetType argumentType = argument.getType();
List<TypeProjection> projectionsFromSuper = typeArgumentsFromSuper.get(i); List<TypeProjection> projectionsFromSuper = typeArgumentsFromSuper.get(parameter.getIndex());
Collection<JetType> argTypesFromSuper = getTypes(projectionsFromSuper); Collection<JetType> argTypesFromSuper = getTypes(projectionsFromSuper);
boolean covariantPosition = effectiveProjectionKind == TypeCheckingProcedure.EnrichedProjectionKind.OUT; boolean covariantPosition = effectiveProjectionKind == TypeCheckingProcedure.EnrichedProjectionKind.OUT;
@@ -186,16 +186,14 @@ public class SignaturesPropagation {
// Enumerate all types from super and all its parameters // Enumerate all types from super and all its parameters
for (JetType typeFromSuper : typesFromSuper) { for (JetType typeFromSuper : typesFromSuper) {
List<TypeParameterDescriptor> typeFromSuperParameters = typeFromSuper.getConstructor().getParameters(); for (TypeParameterDescriptor parameter : typeFromSuper.getConstructor().getParameters()) {
for (int i = 0; i < typeFromSuperParameters.size(); i++) { TypeProjection argument = typeFromSuper.getArguments().get(parameter.getIndex());
TypeParameterDescriptor parameter = typeFromSuperParameters.get(i);
TypeProjection argument = typeFromSuper.getArguments().get(i);
// for given example, this block is executed four times: // for given example, this block is executed four times:
// 1. typeFromSuper = Bar<String, List<Int>>, i = 0, parameter = "#0 of Bar", argument = String // 1. typeFromSuper = Bar<String, List<Int>>, parameter = "#0 of Bar", argument = String
// 2. typeFromSuper = Bar<String, List<Int>>, i = 1, parameter = "#1 of Bar", argument = List<Int> // 2. typeFromSuper = Bar<String, List<Int>>, parameter = "#1 of Bar", argument = List<Int>
// 3. typeFromSuper = Baz<Boolean, CharSequence>, i = 0, parameter = "#0 of Baz", argument = Boolean // 3. typeFromSuper = Baz<Boolean, CharSequence>, parameter = "#0 of Baz", argument = Boolean
// 4. typeFromSuper = Baz<Boolean, CharSequence>, i = 1, parameter = "#1 of Baz", argument = CharSequence // 4. typeFromSuper = Baz<Boolean, CharSequence>, parameter = "#1 of Baz", argument = CharSequence
// if it is mapped to klass' parameter, then store it into map // if it is mapped to klass' parameter, then store it into map
for (TypeProjection projection : substitution.get(parameter.getTypeConstructor())) { for (TypeProjection projection : substitution.get(parameter.getTypeConstructor())) {