Add token index position to classes and types for more accurate error reporting.

runtime/vm/unit_test.cc

 // Copyright (c) 2011, 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 <stdio.h>
 
 #include "vm/unit_test.h"
 
 #include "vm/assembler.h"
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
 #include "vm/code_index_table.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/disassembler.h"
 #include "vm/longjump.h"
 #include "vm/parser.h"
 #include "vm/virtual_memory.h"
 
 
 namespace dart {
 
 DECLARE_FLAG(bool, disassemble);
 
 
-static const intptr_t kPos = 1;  // Dummy token index in non-existing source.
-
-
 TestCaseBase* TestCaseBase::first_ = NULL;
 TestCaseBase* TestCaseBase::tail_ = NULL;
 
 
 TestCaseBase::TestCaseBase(const char* name) : next_(NULL), name_(name) {
   if (first_ == NULL) {
     first_ = this;
   } else {
     tail_->next_ = this;
   }
@@ skipping 79 matching lines @@
     Disassembler::Disassemble(start, start + assembler_->CodeSize());
     OS::Print("}\n");
   }
   const Instructions& instructions = Instructions::Handle(code.instructions());
   return instructions.EntryPoint();
 }
 
 
 CodeGenTest::CodeGenTest(const char* name)
   : function_(Function::ZoneHandle()),
-    node_sequence_(new SequenceNode(kPos, new LocalScope(NULL, 0, 0))),
+    node_sequence_(new SequenceNode(Scanner::kDummyTokenIndex,
+                                    new LocalScope(NULL, 0, 0))),
     default_parameter_values_(Array::ZoneHandle()) {
   ASSERT(name != NULL);
   const String& function_name = String::ZoneHandle(String::NewSymbol(name));
   function_ = Function::New(
       function_name, RawFunction::kFunction, true, false, 0);
   function_.set_result_type(Type::Handle(Type::DynamicType()));
   // Add function to a class and that class to the class dictionary so that
   // frame walking can be used.
   Class& cls = Class::ZoneHandle();
   const Script& script = Script::Handle();
-  cls = Class::New(function_name, script);
+  cls = Class::New(function_name, script, Scanner::kDummyTokenIndex);
   const Array& functions = Array::Handle(Array::New(1));
   functions.SetAt(0, function_);
   cls.SetFunctions(functions);
   Library& lib = Library::Handle(Library::CoreLibrary());
   lib.AddClass(cls);
 }
 
 
 void CodeGenTest::Compile() {
   Assembler assembler;
@@ skipping 44 matching lines @@
 
 
 bool CompilerTest::TestCompileFunction(const Function& function) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   const Error& error = Error::Handle(Compiler::CompileFunction(function));
   return error.IsNull();
 }
 
 }  // namespace dart