Resolve initializers in their proper scope.

dart/frog/leg/resolver.dart

Index: dart/frog/leg/resolver.dart
diff --git a/dart/frog/leg/resolver.dart b/dart/frog/leg/resolver.dart
index 245f6b28c97fa37df4affe246e36c2dde476dfeb..cd70047913ee5b9e6b74d95fd29569986ed7bd5e 100644
--- a/dart/frog/leg/resolver.dart
+++ b/dart/frog/leg/resolver.dart
@@ -48,9 +48,11 @@ class ResolverTask extends CompilerTask {
           return resolveMethodElement(element);
 
         case ElementKind.FIELD:
+          return resolveVariableElement(element);

[ngeoffray, 2012/03/23 07:50:22]

Should that be renamed to resolveField then?

[ahe, 2012/03/23 11:30:31]

Done.

+
         case ElementKind.PARAMETER:
         case ElementKind.FIELD_PARAMETER:
-          return resolveVariableElement(element);
+          return resolveParameter(element);
 
         default:
           compiler.unimplemented(
@@ -189,10 +191,15 @@ class ResolverTask extends CompilerTask {
   TreeElements resolveVariableElement(Element element) {
     Node tree = element.parseNode(compiler);
     ResolverVisitor visitor = new ResolverVisitor(compiler, element);
-    if (tree is SendSet) {
-      SendSet send = tree;
-      visitor.visit(send.arguments.head);
-    }
+    initializerDo(tree, visitor.visit);

[floitsch, 2012/03/23 06:46:17]

I would prefer keeping this function locally here (and duplicate in other
classes if necessary).
Also I would prefer 'visitPotentialInitializer'.

[ngeoffray, 2012/03/23 07:50:22]

+1
visitPotentialInitializer -> handlePotentialInitializer

[ahe, 2012/03/23 11:30:31]

I would like to discuss this in person. I'll keep the current version but add a
TODO that we need to consider if this pattern is acceptable.

Perhaps this should be a method on Node. I'm trying to make certain operations
easier as they are repeated in many places.

+    return visitor.mapping;
+  }
+
+  TreeElements resolveParameter(Element element) {
+    Node tree = element.parseNode(compiler);
+    ResolverVisitor visitor =
+      new ResolverVisitor(compiler, element.enclosingElement);

[floitsch, 2012/03/23 06:46:17]

4 chars indent.

[ahe, 2012/03/23 11:30:31]

Done.

+    initializerDo(tree, visitor.visit);
     return visitor.mapping;
   }
 
@@ -651,6 +658,7 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
       }
       VariableDefinitions variableDefinitions = parameterNodes.head;
       Node parameterNode = variableDefinitions.definitions.nodes.head;
+      initializerDo(parameterNode, (n) => n.accept(this));
       // Field parameters (this.x) are not visible inside the constructor. The
       // fields they reference are visible, but must be resolved independently.
       if (element.kind == ElementKind.FIELD_PARAMETER) {