Refactor SourceFile, SourceFileProvider and SourceLocation.

pkg/compiler/lib/src/source_file_provider.dart

 // 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.
 
 library source_file_provider;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math' as math;
@@ skipping 12 matching lines @@
   // +1 to have a 0 terminated list, see [Scanner].
   var buffer = new Uint8List(length + 1);
   var bytes = file.readIntoSync(buffer, 0, length);
   file.closeSync();
   return buffer;
 }
 
 abstract class SourceFileProvider {
   bool isWindows = (Platform.operatingSystem == 'windows');
   Uri cwd = currentDirectory;
-  Map<String, SourceFile> sourceFiles = <String, SourceFile>{};
+  Map<Uri, SourceFile> sourceFiles = <Uri, SourceFile>{};
   int dartCharactersRead = 0;
 
   Future<String> readStringFromUri(Uri resourceUri) {
     return readUtf8BytesFromUri(resourceUri).then(UTF8.decode);
   }
 
   Future<List<int>> readUtf8BytesFromUri(Uri resourceUri) {
     if (resourceUri.scheme == 'file') {
       return _readFromFile(resourceUri);
     } else if (resourceUri.scheme == 'http' || resourceUri.scheme == 'https') {
@@ skipping 11 matching lines @@
     } on FileSystemException catch (ex) {
       OSError ose = ex.osError;
       String detail = (ose != null && ose.message != null)
           ? ' (${ose.message})'
           : '';
       return new Future.error(
           "Error reading '${relativize(cwd, resourceUri, isWindows)}'"
           "$detail");
     }
     dartCharactersRead += source.length;
-    sourceFiles[resourceUri.toString()] =
-        new CachingUtf8BytesSourceFile(relativizeUri(resourceUri), source);
+    sourceFiles[resourceUri] =
+        new CachingUtf8BytesSourceFile(
+            resourceUri, relativizeUri(resourceUri), source);
     return new Future.value(source);
   }
 
   Future<List<int>> _readFromHttp(Uri resourceUri) {
     assert(resourceUri.scheme == 'http');
     HttpClient client = new HttpClient();
     return client.getUrl(resourceUri)
         .then((HttpClientRequest request) => request.close())
         .then((HttpClientResponse response) {
           if (response.statusCode != HttpStatus.OK) {
             String msg = 'Failure getting $resourceUri: '
                       '${response.statusCode} ${response.reasonPhrase}';
             throw msg;
           }
           return response.toList();
         })
         .then((List<List<int>> splitContent) {
            int totalLength = splitContent.fold(0, (int old, List list) {
              return old + list.length;
            });
            Uint8List result = new Uint8List(totalLength);
            int offset = 0;
            for (List<int> contentPart in splitContent) {
              result.setRange(
                  offset, offset + contentPart.length, contentPart);
              offset += contentPart.length;
            }
            dartCharactersRead += totalLength;
-           sourceFiles[resourceUri.toString()] =
-               new CachingUtf8BytesSourceFile(resourceUri.toString(), result);
+           sourceFiles[resourceUri] =
+               new CachingUtf8BytesSourceFile(
+                   resourceUri, resourceUri.toString(), result);
            return result;
          });
   }
 
   Future/*<List<int> | String>*/ call(Uri resourceUri);
 
   relativizeUri(Uri uri) => relativize(cwd, uri, isWindows);
 }
 
 class CompilerSourceFileProvider extends SourceFileProvider {
@@ skipping 88 matching lines @@
       color = colors.green;
     } else {
       throw 'Unknown kind: $kind (${kind.ordinal})';
     }
     if (!enableColors) {
       color = (x) => x;
     }
     if (uri == null) {
       print('${color(message)}');
     } else {
-      SourceFile file = provider.sourceFiles[uri.toString()];
+      SourceFile file = provider.sourceFiles[uri];
       if (file != null) {
         print(file.getLocationMessage(
           color(message), begin, end, colorize: color));
       } else {
         String position = end - begin > 0 ? '@$begin+${end - begin}' : '';
         print('${provider.relativizeUri(uri)}$position:\n'
               '${color(message)}');
       }
     }
     if (fatal && ++fatalCount >= throwOnErrorCount && throwOnError) {
@@ skipping 107 matching lines @@
   var onAdd, onClose;
 
   EventSinkWrapper(this.onAdd, this.onClose);
 
   void add(String data) => onAdd(data);
 
   void addError(error, [StackTrace stackTrace]) => throw error;
 
   void close() => onClose();
 }