Source positions for constructors and lots of async machinery

runtime/lib/mirrors.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 "lib/mirrors.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 1464 matching lines @@
       // the equality test.
       function = function.parent_function();
     }
 
     Type& instantiator = Type::Handle();
     if (closure.IsClosure()) {
       const TypeArguments& arguments =
           TypeArguments::Handle(Closure::GetTypeArguments(closure));
       const Class& cls =
           Class::Handle(Isolate::Current()->object_store()->object_class());
-      instantiator = Type::New(cls, arguments, Scanner::kNoSourcePos);
+      instantiator = Type::New(cls, arguments, Token::kNoSourcePos);
       instantiator.SetIsFinalized();
     }
     return CreateMethodMirror(function,
                               Instance::null_instance(),
                               instantiator);
   }
   return Instance::null();
 }
 
 
@@ skipping 500 matching lines @@
   if (reflectee.IsMirrorReference()) {
     const MirrorReference& decl_ref = MirrorReference::Cast(reflectee);
     decl = decl_ref.referent();
   } else if (reflectee.IsTypeParameter()) {
     decl = reflectee.raw();
   } else {
     UNREACHABLE();
   }
 
   Script& script = Script::Handle();
-  intptr_t token_pos = Scanner::kNoSourcePos;
+  intptr_t token_pos = Token::kNoSourcePos;
 
   if (decl.IsFunction()) {
     const Function& func = Function::Cast(decl);
     if (func.IsImplicitConstructor() || func.IsSignatureFunction()) {
       // These are synthetic methods; they have no source.
       return Instance::null();
     }
     script = func.script();
     token_pos = func.token_pos();
   } else if (decl.IsClass()) {
@@ skipping 34 matching lines @@
       const String& uri = String::Handle(script.url());
       return CreateSourceLocation(uri, 1, 1);
     }
     const TokenStream& stream = TokenStream::Handle(script.tokens());
     TokenStream::Iterator tkit(stream, 0);
     if (tkit.CurrentTokenKind() == Token::kSCRIPTTAG) tkit.Advance();
     token_pos = tkit.CurrentPosition();
   }
 
   ASSERT(!script.IsNull());
-  ASSERT(token_pos != Scanner::kNoSourcePos);
+  ASSERT(token_pos != Token::kNoSourcePos);
 
   const String& uri = String::Handle(script.url());
   intptr_t from_line = 0;
   intptr_t from_col = 0;
   if (script.HasSource()) {
     script.GetTokenLocation(token_pos, &from_line, &from_col);
   } else {
     // Avoid the slow path of printing the token stream when precise source
     // information is not available.
     script.GetTokenLocation(token_pos, &from_line, NULL);
@@ skipping 37 matching lines @@
 }
 
 DEFINE_NATIVE_ENTRY(TypeMirror_subtypeTest, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, a, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, b, arguments->NativeArgAt(1));
   return Bool::Get(a.IsSubtypeOf(b, NULL)).raw();
 }
 
 
 }  // namespace dart