Resolve initializers in their proper scope.

dart/frog/leg/resolver.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 interface TreeElements {
   Element operator[](Node node);
   Selector getSelector(Send send);
 }
 
 class TreeElementMapping implements TreeElements {
@@ skipping 30 matching lines @@
   TreeElements resolve(Element element) {
     return measure(() {
       switch (element.kind) {
         case ElementKind.GENERATIVE_CONSTRUCTOR:
         case ElementKind.FUNCTION:
         case ElementKind.GETTER:
         case ElementKind.SETTER:
           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(
               "resolver", node: element.parseNode(compiler));
       }
     });
   }
 
   SourceString getConstructorName(Send node) {
     if (node.receiver !== null) {
@@ skipping 118 matching lines @@
         // "MyInterface.name" or "MyClass.name".
         error(node, MessageKind.CANNOT_FIND_CONSTRUCTOR2,
               [constructor.name, name]);
       }
     }
   }
 
   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;
+  }
+
   Type resolveType(ClassElement element) {
     if (element.isResolved) return element.type;
     return measure(() {
       ClassNode tree = element.parseNode(compiler);
       ClassResolverVisitor visitor =
         new ClassResolverVisitor(compiler, element.getLibrary(), element);
       visitor.visit(tree);
       element.isResolved = true;
       return element.type;
     });
@@ skipping 435 matching lines @@
     FunctionParameters functionParameters =
         function.computeParameters(compiler);
     Link<Node> parameterNodes = node.parameters.nodes;
     functionParameters.forEachParameter((Element element) {
       if (element == functionParameters.optionalParameters.head) {
         NodeList nodes = parameterNodes.head;
         parameterNodes = nodes.nodes;
       }
       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) {
         useElement(parameterNode, element);
       } else {
         defineElement(variableDefinitions.definitions.nodes.head, element);
       }
       parameterNodes = parameterNodes.tail;
     });
   }
@@ skipping 1116 matching lines @@
 
   TopScope(LibraryElement library) : super(null, library);
   Element lookup(SourceString name) {
     return library.find(name);
   }
 
   Element add(Element element) {
     throw "Cannot add an element in the top scope";
   }
 }