- Include original, loaded URI in error message.

runtime/bin/builtin.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 builtin;
 // NOTE: Do not import 'dart:io' in builtin.
 import 'dart:collection';
 import 'dart:isolate';
 import 'dart:typed_data';
 
@@ skipping 73 matching lines @@
 
 // Special handling for Windows paths so that they are compatible with URI
 // handling.
 // Embedder sets this to true if we are running on Windows.
 bool _isWindows = false;
 
 
 // A class wrapping the load error message in an Error object.
 class _LoadError extends Error {
   final String message;
-  _LoadError(this.message);
+  final String uri;
+  _LoadError(this.uri, this.message);
 
-  String toString() => 'Load Error: $message';
+  String toString() => 'Load Error for "$uri": $message';
 }
 
 // Class collecting all of the information about a particular load request.
 class _LoadRequest {
   final int _id;
   final int _tag;
   final String _uri;
   final String _libraryUri;
 
   _LoadRequest(this._id, this._tag, this._uri, this._libraryUri);
@@ skipping 166 matching lines @@
 void _handleLoaderReply(msg) {
   int id = msg[0];
   var dataOrError = msg[1];
   assert((id >= 0) && (id < _reqId));
   var req = _reqMap[id];
   try {
     if (dataOrError is Uint8List) {
       _loadScript(req, dataOrError);
     } else {
       assert(dataOrError is String);
-      var error = new _LoadError(dataOrError.toString());
+      var error = new _LoadError(req._uri, dataOrError.toString());
       _asyncLoadError(req, error);
     }
   } catch(e, s) {
     // Wrap inside a _LoadError unless we are already propagating a
     // previous _LoadError.
-    var error = (e is _LoadError) ? e : new _LoadError(e.toString());
+    var error = (e is _LoadError) ? e : new _LoadError(req._uri, e.toString());
     assert(req != null);
     _asyncLoadError(req, error);
   }
 }
 
 
 void _startLoadRequest(int tag,
                        String uri,
                        String libraryUri,
                        Uri resourceUri) {
@@ skipping 206 matching lines @@
   } else {
     name = userUri.substring(index + 1);
     path = userUri.substring(0, index + 1);
   }
 
   path = _filePathFromUri(path);
   var filename = _platformExtensionFileName(name);
 
   return [path, filename, name];
 }