Source positions for constructors and lots of async machinery

runtime/vm/scopes_test.cc

 // 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.
 
 #include "platform/assert.h"
 #include "vm/ast.h"
 #include "vm/scopes.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 TEST_CASE(LocalScope) {
   // Allocate a couple of local variables first.
   const Type& dynamic_type = Type::ZoneHandle(Type::DynamicType());
   const String& a = String::ZoneHandle(Symbols::New("a"));
   LocalVariable* var_a =
-      new LocalVariable(Scanner::kNoSourcePos, a, dynamic_type);
+      new LocalVariable(Token::kNoSourcePos, a, dynamic_type);
   LocalVariable* inner_var_a =
-      new LocalVariable(Scanner::kNoSourcePos, a, dynamic_type);
+      new LocalVariable(Token::kNoSourcePos, a, dynamic_type);
   const String& b = String::ZoneHandle(Symbols::New("b"));
   LocalVariable* var_b =
-      new LocalVariable(Scanner::kNoSourcePos, b, dynamic_type);
+      new LocalVariable(Token::kNoSourcePos, b, dynamic_type);
   const String& c = String::ZoneHandle(Symbols::New("c"));
   LocalVariable* var_c =
-      new LocalVariable(Scanner::kNoSourcePos, c, dynamic_type);
+      new LocalVariable(Token::kNoSourcePos, c, dynamic_type);
   const String& L = String::ZoneHandle(Symbols::New("L"));
   SourceLabel* label_L =
-      new SourceLabel(Scanner::kNoSourcePos, L, SourceLabel::kFor);
+      new SourceLabel(Token::kNoSourcePos, L, SourceLabel::kFor);
 
   LocalScope* outer_scope = new LocalScope(NULL, 0, 0);
   LocalScope* inner_scope1 = new LocalScope(outer_scope, 0, 0);
   LocalScope* inner_scope2 = new LocalScope(outer_scope, 0, 0);
 
   EXPECT(outer_scope->parent() == NULL);
   EXPECT_EQ(outer_scope, inner_scope1->parent());
   EXPECT_EQ(outer_scope, inner_scope2->parent());
   EXPECT_EQ(inner_scope2, outer_scope->child());
   EXPECT_EQ(inner_scope1, inner_scope2->sibling());
@@ skipping 67 matching lines @@
          (inner_scope1->VariableAt(1) == var_b));
   EXPECT((inner_scope2->VariableAt(0) == var_a) ||
          (inner_scope2->VariableAt(1) == var_a) ||
          (inner_scope2->VariableAt(2) == var_a));
   EXPECT((inner_scope2->VariableAt(0) == var_c) ||
          (inner_scope2->VariableAt(1) == var_c) ||
          (inner_scope2->VariableAt(2) == var_c));
 }
 
 }  // namespace dart