Refactor URI processing of native extensions directive #import("dart-ext:foo").

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");
 
 void print(arg) {
   _Logger._printString(arg.toString());
 }
 
@@ skipping 49 matching lines @@
   var base = new Uri(scheme: "file", path: cwd.endsWith("/") ? cwd : "$cwd/");
   _entrypoint = base.resolve(scriptName);
   _logResolution("# Resolved script to: $_entrypoint");
 
   return _entrypoint.toString();
 }
 
 String _resolveUri(String base, String userString) {
   var baseUri = new Uri.fromString(base);
   _logResolution("# Resolving: $userString from $base");
-  var resolved = baseUri.resolve(userString);
+
+  // Relative URIs with scheme dart-ext should be resolved as if with no scheme.
+  var uri = new Uri.fromString(userString);
+  var resolved;
+  if ('dart-ext' == uri.scheme) {
+    resolved = baseUri.resolve(uri.path);
+    resolved = new Uri(scheme: "dart-ext", path: resolved.path);
+  } else {
+    resolved = baseUri.resolve(userString);
+  }
   _logResolution("# Resolved to: $resolved");
   return resolved.toString();
 }
 
-String _resolveExtensionUri(String base, String userString) {
-  var uri = new Uri.fromString(userString);
-  if ("dart-ext" != uri.scheme) {
-    throw "Not a Dart extension uri: $uri";
-  }
-  var schemelessUri = new Uri(path: uri.path);
-  var baseUri = new Uri.fromString(base);
-  _logResolution("# Resolving: $userString from $base");
-  var resolved = baseUri.resolveUri(schemelessUri);
-  resolved = new Uri(scheme: 'dart-ext', path: resolved.path);
-  _logResolution("# Resolved to: $resolved");
-  return resolved.toString();
-}
 
 String _filePathFromUri(String userUri) {
   var uri = new Uri.fromString(userUri);
   _logResolution("# Getting file path from: $uri");
 
   var path;
   switch (uri.scheme) {
-  case 'file':    path = _filePathFromFileUri(uri); break;
+  case 'file': path = _filePathFromFileUri(uri); break;
+  case 'dart-ext': path = _filePathFromOtherUri(uri); break;
   case 'package': path = _filePathFromPackageUri(uri); break;
 
   default:
-    // Only handling file and package URIs in standalone binary.
-    _logResolution("# Not a file or package URI.");
+    // Only handling file, dart-ext and package URIs in standalone binary.
+    _logResolution("# Not a file, dart-ext, or package URI.");
     throw "Not a known scheme: $uri";
   }
 
   if (_is_windows) {
     // Drop the leading / before the drive letter.
     path = path.substring(1);
     _logResolution("# path: $path");
   }
 
   return path;
 }
 
 String _filePathFromFileUri(Uri uri) {
   if (uri.domain != '') {
     throw "URIs using the 'file:' scheme may not contain a domain.";
   }
 
   _logResolution("# Path: ${uri.path}");
   return uri.path;
 }
 
+String _filePathFromOtherUri(Uri uri) {
+  if (uri.domain != '') {
+    throw "URIs whose paths are used as file paths may not contain a domain.";
+  }
+
+  _logResolution("# Path: ${uri.path}");
+  return uri.path;
+}
+
 String _filePathFromPackageUri(Uri uri) {
   if (uri.domain != '') {
     var path = (uri.path != '') ? '${uri.domain}${uri.path}' : uri.domain;
     var right = 'package:$path';
     var wrong = 'package://$path';
 
     throw "URIs using the 'package:' scheme should look like " +
           "'$right', not '$wrong'.";
   }
 
   var path = _entrypoint.resolve('packages/${uri.path}').path;
   _logResolution("# Package: $path");
   return path;
 }