Implement correct scoping rules for variables.

sdk/lib/_internal/compiler/implementation/tree/nodes.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.
 
 part of tree;
 
 abstract class Visitor<R> {
   const Visitor();
 
   R visitNode(Node node);
@@ skipping 537 matching lines @@
       while (!link.tail.isEmpty) link = link.tail;
       if (link.head.getEndToken() != null) return link.head.getEndToken();
       if (link.head.getBeginToken() != null) return link.head.getBeginToken();
     }
     return beginToken;
   }
 }
 
 class Block extends Statement {
   final NodeList statements;
+  final Link<VariableDefinitions> declarations;

[ahe, 2013/09/26 07:48:07]

I'm not sure this is a good place for this information. It feels like this
belongs in the element model.

[ngeoffray, 2013/09/26 07:48:38]

This seems off. Can't you handle during resolution?

[karlklose, 2013/09/27 07:07:43]

We do not really have a place to store it in the model, so I'll rewrite this to
compute the information in the resolver. These declarations are part of the
tree, but I see you point of keeping the AST nodes as clean as possible, and the
information can be recomputed by walking the tree again.

 
-  Block(this.statements);
+  Block(this.statements, this.declarations);
 
   Block asBlock() => this;
 
   accept(Visitor visitor) => visitor.visitBlock(this);
 
   visitChildren(Visitor visitor) {
     if (statements != null) statements.accept(visitor);
   }
 
   Token getBeginToken() => statements.getBeginToken();
@@ skipping 989 matching lines @@
 
 class SwitchCase extends Node {
   // The labels and case patterns are collected in [labelsAndCases].
   // The default keyword, if present, is collected in [defaultKeyword].
   // Any actual switch case must have at least one 'case' or 'default'
   // clause.
   // Notice: The labels and cases can occur interleaved in the source.
   // They are separated here, since the order is irrelevant to the meaning
   // of the switch.
 
+  final Link<VariableDefinitions> declarations;

[ahe, 2013/09/26 07:48:07]

This doesn't feel like a part of a switch case.

[karlklose, 2013/09/27 07:07:43]

They are part of the statements, that's why I added it here and in Block.

+
   /** List of [Label] and [CaseMatch] nodes. */
   final NodeList labelsAndCases;
   /** A "default" keyword token, if applicable. */
   final Token defaultKeyword;
   /** List of statements, the body of the case. */
   final NodeList statements;
 
   final Token startToken;
 
-  SwitchCase(this.labelsAndCases, this.defaultKeyword,
-             this.statements, this.startToken);
+  SwitchCase(this.labelsAndCases, this.defaultKeyword, this.statements,
+      this.startToken, this.declarations);

[ngeoffray, 2013/09/26 07:48:38]

indentation.

 
   SwitchCase asSwitchCase() => this;
 
   bool get isDefaultCase => defaultKeyword != null;
 
   bool isValidContinueTarget() => true;
 
   accept(Visitor visitor) => visitor.visitSwitchCase(this);
 
   visitChildren(Visitor visitor) {
@@ skipping 487 matching lines @@
  * argument).
  *
  * TODO(ahe): This method is controversial, the team needs to discuss
  * if top-level methods are acceptable and what naming conventions to
  * use.
  */
 initializerDo(Node node, f(Node node)) {
   SendSet send = node.asSendSet();
   if (send != null) return f(send.arguments.head);
 }