Simplify the canonicalization of dart-ext uris.

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:async';
 import 'dart:collection';
 import 'dart:_internal';
 import 'dart:isolate';
@@ skipping 684 matching lines @@
 // Function called by standalone embedder to resolve uris when the VM requests
 // Dart_kCanonicalizeUrl from the tag handler.
 String _resolveUri(String base, String userString) {
   if (!_setupCompleted) {
     _setupHooks();
   }
   if (_traceLoading) {
     _log('Resolving: $userString from $base');
   }
   var baseUri = Uri.parse(base);
-  var result;
-  if (userString.startsWith(_DART_EXT)) {
-    var uri = userString.substring(_DART_EXT.length);
-    result = '$_DART_EXT${baseUri.resolve(uri)}';
-  } else {
-    result = baseUri.resolve(userString).toString();
-  }
+  var result = baseUri.resolve(userString).toString();
   if (_traceLoading) {
     _log('Resolved $userString in $base to $result');
   }
   return result;
 }
 
 
 // Handling of access to the package root or package map from user code.
 _triggerPackageResolution(action) {
   if (_packagesReady) {
@@ skipping 102 matching lines @@
   }
   uri = _workingDirectory.resolveUri(uri);
 
   if (_traceLoading) {
     _log('Resolved in working directory: $fileName -> $uri');
   }
   return uri.toString();
 }
 
 
-// Handling of dart-ext loading.
-// Dart native extension scheme.
-const _DART_EXT = 'dart-ext:';
-
 // Returns either a file path or a URI starting with http[s]:, as a String.
 String _filePathFromUri(String userUri) {
   var uri = Uri.parse(userUri);
   if (_traceLoading) {
     _log('Getting file path from: $uri');
   }
 
   var path;
   switch (uri.scheme) {
     case '':
     case 'file':
     return uri.toFilePath();
     case 'package':
     return _filePathFromUri(_resolvePackageUri(uri).toString());
     case 'data':
     case 'http':
     case 'https':
     return uri.toString();
     default:
     // Only handling file, http, and package URIs
     // in standalone binary.
     if (_traceLoading) {
       _log('Unknown scheme (${uri.scheme}) in $uri.');
     }
     throw 'Not a known scheme: $uri';
   }
 }
 
 
-// Embedder Entrypoint:
-// When loading an extension the embedder calls this method to get the
-// different components.
-// Returns the directory part, the filename part, and the name
-// of a native extension URL as a list [directory, filename, name].
-// The directory part is either a file system path or an HTTP(S) URL.
-// The filename part is the extension name, with the platform-dependent
-// prefixes and extensions added.
-_extensionPathFromUri(String userUri) {
+// Embedder Entrypoint.
+_libraryFilePath(String libraryUri) {
   if (!_setupCompleted) {
     _setupHooks();
   }
-  if (!userUri.startsWith(_DART_EXT)) {
-    throw 'Unexpected internal error: Extension URI $userUri missing dart-ext:';
+  int index = libraryUri.lastIndexOf('/');
+  var path;
+  if (index == -1) {
+    path = './';
+  } else {
+    path = libraryUri.substring(0, index + 1);
   }
-  userUri = userUri.substring(_DART_EXT.length);
-
-  if (userUri.contains('\\')) {
-    throw 'Unexpected internal error: Extension URI $userUri contains \\';
-  }
-
-  String name;
-  String path;  // Will end in '/'.
-  int index = userUri.lastIndexOf('/');
-  if (index == -1) {
-    name = userUri;
-    path = './';
-  } else if (index == userUri.length - 1) {
-    throw 'Extension name missing in $extensionUri';
-  } else {
-    name = userUri.substring(index + 1);
-    path = userUri.substring(0, index + 1);
-  }
-  path = _filePathFromUri(path);
-
-  return [path, name];
+  return _filePathFromUri(path);
 }
 
 
 // Register callbacks and hooks with the rest of the core libraries.
 _setupHooks() {
   _setupCompleted = true;
   VMLibraryHooks.resourceReadAsBytes = _resourceReadAsBytes;
 
   VMLibraryHooks.packageRootUriFuture = _getPackageRootFuture;
   VMLibraryHooks.packageConfigUriFuture = _getPackageConfigFuture;
   VMLibraryHooks.resolvePackageUriFuture = _resolvePackageUriFuture;
 }