Clean up error handling.

dart/tests/compiler/dart2js/mock_compiler.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.
 
 library mock_compiler;
 
 import "package:expect/expect.dart";
 import 'dart:collection';
 
 import '../../../sdk/lib/_internal/compiler/compiler.dart' as api;
@@ skipping 12 matching lines @@
 import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
     hide TreeElementMapping;
 
 import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
 
 import '../../../sdk/lib/_internal/compiler/implementation/deferred_load.dart'
     show DeferredLoadTask;
 
 
 class WarningMessage {
-  Node node;
+  Spannable node;
   Message message;
   WarningMessage(this.node, this.message);
 
   toString() => message.toString();
 }
 
 const String DEFAULT_HELPERLIB = r'''
   wrapException(x) { return x; }
   iae(x) { throw x; } ioore(x) { throw x; }
   guard$array(x) { return x; }
@@ skipping 230 matching lines @@
   }
 
   /**
    * Used internally to create a library from a source text. The created library
    * is fixed to export its top-level declarations.
    */
   LibraryElement createLibrary(String name, String source) {
     Uri uri = new Uri(scheme: "dart", path: name);
     var script = new Script(uri, new MockFile(source));
     var library = new LibraryElementX(script);
+    library.libraryTag = new LibraryName(null, null, null);
     parseScript(source, library);
     library.setExports(library.localScope.values.toList());
     registerSource(uri, source);
     libraries.putIfAbsent(uri.toString(), () => library);
     return library;
   }
 
   void reportWarning(Node node, var message) {
     if (message is! Message) message = message.message;
     warnings.add(new WarningMessage(node, message));
     reportDiagnostic(spanFromNode(node),
         'Warning: $message', api.Diagnostic.WARNING);
   }
 
-  void reportError(Node node, var message) {
-    if (message is String && message.startsWith("no library name found in")) {
-      // TODO(ahe): Fix the MockCompiler to not have this problem.
-      return;
-    }
-    if (message is! Message) message = message.message;
+  void reportError(Spannable node,
+                   MessageKind errorCode,
+                   [Map arguments = const {}]) {
+    Message message = errorCode.message(arguments);
     errors.add(new WarningMessage(node, message));
-    reportDiagnostic(spanFromNode(node),
-        'Error: $message', api.Diagnostic.ERROR);
+    reportDiagnostic(spanFromSpannable(node), '$message', api.Diagnostic.ERROR);
+  }
+
+  void reportFatalError(Spannable node,
+                        MessageKind errorCode,
+                        [Map arguments = const {}]) {
+    reportError(node, errorCode, arguments);
   }
 
   void reportMessage(SourceSpan span, var message, api.Diagnostic kind) {
     var diagnostic = new WarningMessage(null, message.message);
     if (kind == api.Diagnostic.ERROR) {
       errors.add(diagnostic);
     } else {
       warnings.add(diagnostic);
     }
     reportDiagnostic(span, "$message", kind);
@@ skipping 138 matching lines @@
   }
 }
 
 class MockDeferredLoadTask extends DeferredLoadTask {
   MockDeferredLoadTask(Compiler compiler) : super(compiler);
 
   void registerMainApp(LibraryElement mainApp) {
     // Do nothing.
   }
 }