From cf639e8c328f7c8a82aabd204c7bc7cb7d7a3b70 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Fri, 22 Jun 2012 18:03:08 +0400
Subject: [PATCH] use 'getIndex' in parameters instead of 'int i' counter

---
 .../jet/lang/resolve/DeclarationResolver.java        | 12 ++++++------
 .../jet/lang/resolve/lazy/LazyClassMemberScope.java  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
index 83f4da6f420..0754795388a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
@@ -230,21 +230,21 @@ public class DeclarationResolver {
         JetScope memberScope = classDescriptor.getScopeForSupertypeResolution();
         ConstructorDescriptor constructorDescriptor = descriptorResolver.resolvePrimaryConstructorDescriptor(memberScope, classDescriptor, klass, trace);
         if (constructorDescriptor != null) {
-            List<ValueParameterDescriptor> valueParameters = constructorDescriptor.getValueParameters();
-            assert valueParameters.size() == klass.getPrimaryConstructorParameters().size();
-            int i = 0;
-            for (JetParameter parameter : klass.getPrimaryConstructorParameters()) {
+            List<ValueParameterDescriptor> valueParameterDescriptors = constructorDescriptor.getValueParameters();
+            List<JetParameter> primaryConstructorParameters = klass.getPrimaryConstructorParameters();
+            assert valueParameterDescriptors.size() == primaryConstructorParameters.size();
+            for (ValueParameterDescriptor valueParameterDescriptor : valueParameterDescriptors) {
+                JetParameter parameter = primaryConstructorParameters.get(valueParameterDescriptor.getIndex());
                 if (parameter.getValOrVarNode() != null) {
                     PropertyDescriptor propertyDescriptor = descriptorResolver.resolvePrimaryConstructorParameterToAProperty(
                             classDescriptor,
-                            valueParameters.get(i),
+                            valueParameterDescriptor,
                             memberScope,
                             parameter, trace
                     );
                     classDescriptor.getBuilder().addPropertyDescriptor(propertyDescriptor);
                     context.getPrimaryConstructorParameterProperties().put(parameter, propertyDescriptor);
                 }
-                i++;
             }
             classDescriptor.setPrimaryConstructor(constructorDescriptor, trace);
         }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
index 3476fb9693c..7f75701fccf 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
@@ -110,21 +110,21 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope<LazyClassDescr
 
             ConstructorDescriptor primaryConstructor = getPrimaryConstructor();
             if (primaryConstructor != null) {
-                List<ValueParameterDescriptor> valueParameters = primaryConstructor.getValueParameters();
-                assert valueParameters.size() == jetClass.getPrimaryConstructorParameters().size();
-                int i = 0;
-                for (JetParameter parameter : jetClass.getPrimaryConstructorParameters()) {
+                List<ValueParameterDescriptor> valueParameterDescriptors = primaryConstructor.getValueParameters();
+                List<JetParameter> primaryConstructorParameters = jetClass.getPrimaryConstructorParameters();
+                assert valueParameterDescriptors.size() == primaryConstructorParameters.size();
+                for (ValueParameterDescriptor valueParameterDescriptor : valueParameterDescriptors) {
+                    JetParameter parameter = primaryConstructorParameters.get(valueParameterDescriptor.getIndex());
                     if (parameter.getValOrVarNode() != null && name.equals(parameter.getNameAsName())) {
                         PropertyDescriptor propertyDescriptor =
                                 resolveSession.getInjector().getDescriptorResolver().resolvePrimaryConstructorParameterToAProperty(
                                         thisDescriptor,
-                                        valueParameters.get(i),
+                                        valueParameterDescriptor,
                                         thisDescriptor.getScopeForClassHeaderResolution(),
                                         parameter, resolveSession.getTrace()
                                 );
                         result.add(propertyDescriptor);
                     }
-                    i++;
                 }
             }
         }