Change handling of dart-ext: URIs for native extensions.

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;
 import 'dart:io';
 import 'dart:async';
 // import 'root_library'; happens here from C Code
 
 // The root library (aka the script) is imported into this library. The
@@ skipping 189 matching lines @@
     // Script does not have a scheme, assume that it is a path,
     // resolve it against the working directory.
     _entryPointScript = _workingDirectoryUri.resolve(scriptName);
   }
   _logResolution('# Resolved entry point to: $_entryPointScript');
   return _entryPointScript.toString();
 }
 
 
 String _resolveUri(String base, String userString) {
+  _logResolution('# Resolving: $userString from $base');
+  const DART_EXT = 'dart-ext:';
   var baseUri = Uri.parse(base);
-  _logResolution('# Resolving: $userString from $base');
-
-  var uri = Uri.parse(userString);
-  var resolved;
-  if ('dart-ext' == uri.scheme) {
-    // Relative URIs with scheme dart-ext should be resolved as if with no
-    // scheme.
-    resolved = baseUri.resolve(uri.path);
-    if (resolved.scheme == 'package') {
-      // If we are resolving relative to a package URI we go directly to the
-      // file path and keep the dart-ext scheme. Otherwise, we will lose the
-      // package URI path part.
-      var path = _filePathFromPackageUri(resolved);
-      if (path.startsWith('http:')) {
-        throw "Native extensions not supported in "
-            "packages loaded over http: %path";
-      }
-      resolved = new Uri.file(path);
-    }
-    resolved = new Uri(scheme: 'dart-ext', path: resolved.path);
+  if (userString.startsWith(DART_EXT)) {
+    var uri = userString.substring(DART_EXT.length);
+    return '$DART_EXT${baseUri.resolve(uri)}';
   } else {
-    resolved = baseUri.resolve(userString);
+    return '${baseUri.resolve(userString)}';
   }
-  _logResolution('# Resolved to: $resolved');
-  return resolved.toString();
 }
 
 
 // Returns either a file path or a URI starting with http:, as a String.
 String _filePathFromUri(String userUri) {
+  const DART_EXT = 'dart-ext:';

[Ivan Posva, 2014/03/03 08:26:37]

This constant should only be defined once. How about a top-level _DART_EXT?

[Bill Hesse, 2014/03/04 09:27:14]

Done.  Committed with a typo in r33216, fixed in r33217.

+  if (userUri.startsWith(DART_EXT)) {
+    userUri = userUri.substring(DART_EXT.length);
+  }
   var uri = Uri.parse(userUri);
   _logResolution('# Getting file path from: $uri');
 
   var path;
   switch (uri.scheme) {
     case '':
     case 'file':
       return uri.toFilePath();
       break;
-    case 'dart-ext':
-      // Relative file URIs don't start with file:///.
-      var scheme = (uri.path.startsWith('/') ? 'file' : '');
-      return new Uri(scheme: scheme,
-                     host: uri.host,
-                     path: uri.path).toFilePath();
-      break;
     case 'package':
       return _filePathFromPackageUri(uri);
       break;
     case 'http':
       return uri.toString();
     default:
-      // Only handling file, dart-ext, http, and package URIs
+      // Only handling file, http, and package URIs
       // in standalone binary.
       _logResolution('# Unknown scheme (${uri.scheme}) in $uri.');
       throw 'Not a known scheme: $uri';
   }
 }
 
 
 String _filePathFromPackageUri(Uri uri) {
   if (!uri.host.isEmpty) {
-    var path = (uri.path != '') ? '${uri.host}${uri.path}' : uri.host;
+    var path = '${uri.host}${uri.path}';
     var right = 'package:$path';
     var wrong = 'package://$path';
 
     throw "URIs using the 'package:' scheme should look like "
           "'$right', not '$wrong'.";
   }
 
   var packageRoot = _packageRoot == null ?
                     _entryPointScript.resolve('packages/') :
                     _packageRoot;
   return _filePathFromUri(packageRoot.resolve(uri.path).toString());
 }