Version 1.0.0.6

dart/runtime/vm/class_finalizer.cc

 // Copyright (c) 2013, 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 "vm/class_finalizer.h"
 
+#include "vm/code_generator.h"
 #include "vm/flags.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/longjump.h"
 #include "vm/object_store.h"
-#include "vm/parser.h"
 #include "vm/symbols.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, error_on_bad_override, false,
             "Report error for bad overrides.");
 DEFINE_FLAG(bool, error_on_bad_type, false,
             "Report error for malformed types.");
 DEFINE_FLAG(bool, print_classes, false, "Prints details about loaded classes.");
 DEFINE_FLAG(bool, trace_class_finalization, false, "Trace class finalization.");
@@ skipping 2593 matching lines @@
     OS::Print("  %s\n", field.ToCString());
   }
 }
 
 // Either report an error or mark the type as malformed.
 void ClassFinalizer::ReportMalformedType(const Error& prev_error,
                                          const Script& script,
                                          const Type& type,
                                          const char* format,
                                          va_list args) {
-  LanguageError& error = LanguageError::Handle();
-  if (prev_error.IsNull()) {
-    error ^= Parser::FormatError(
-        script, type.token_pos(), "Error", format, args);
-  } else {
-    error ^= Parser::FormatErrorWithAppend(
-        prev_error, script, type.token_pos(), "Error", format, args);
-  }
+  LanguageError& error = LanguageError::Handle(
+      LanguageError::NewFormattedV(
+          prev_error, script, type.token_pos(),
+          LanguageError::kMalformedType, Heap::kOld,
+          format, args));
   if (FLAG_error_on_bad_type) {
     ReportError(error);
   }
   type.set_malformed_error(error);
   // Make the type raw, since it may not be possible to
   // properly finalize its type arguments.
   type.set_type_class(Class::Handle(Object::dynamic_class()));
   type.set_arguments(Object::null_abstract_type_arguments());
   if (!type.IsFinalized()) {
     type.SetIsFinalized();
@@ skipping 42 matching lines @@
   UNREACHABLE();
 }
 
 
 void ClassFinalizer::ReportError(const Error& prev_error,
                                  const Script& script,
                                  intptr_t token_pos,
                                  const char* format, ...) {
   va_list args;
   va_start(args, format);
-  Error& error = Error::Handle();
-  if (prev_error.IsNull()) {
-    error ^= Parser::FormatError(script, token_pos, "Error", format, args);
-  } else {
-    error ^= Parser::FormatErrorWithAppend(
-        prev_error, script, token_pos, "Error", format, args);
-  }
+  Error& error = Error::Handle(
+      LanguageError::NewFormattedV(
+          prev_error, script, token_pos,
+          LanguageError::kError, Heap::kNew,
+          format, args));
   va_end(args);
   ReportError(error);
 }
 
 
 void ClassFinalizer::VerifyImplicitFieldOffsets() {
 #ifdef DEBUG
   Isolate* isolate = Isolate::Current();
   const ClassTable& class_table = *(isolate->class_table());
   Class& cls = Class::Handle(isolate);
@@ skipping 45 matching lines @@
   expected_name ^= String::New("_offset");
   ASSERT(String::EqualsIgnoringPrivateKey(name, expected_name));
   field ^= fields_array.At(2);
   ASSERT(field.Offset() == TypedDataView::length_offset());
   name ^= field.name();
   ASSERT(name.Equals("length"));
 #endif
 }
 
 }  // namespace dart