- Proper URI resolution when loading scripts from the standalone binary.

bin/builtin.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file

[ahe, 2012/03/06 08:27:15]

This file LGTM, but you may want to change how you append a / to cwd.

 // 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:nativewrappers");
-#import("dart:coreimpl");
 
 void print(arg) {
   _Logger._printString(arg.toString());
 }
 
 void exit(int status) {
   if (status is !int) {
     throw new IllegalArgumentException("int status expected");
   }
   _exit(status);
 }
 
 _exit(int status) native "Exit";
 
 class _Logger {
   static void _printString(String s) native "Logger_PrintString";
 }
+
+
+// Code to deal with URI resolution for the standalone binary.
+void _logResolution(String msg) {
+  final enabled = false;
+  if (enabled) {
+    _Logger._printString(msg);
+  }
+}
+
+// TODO(iposva): Make these private once the Dart API is fixed.

[ahe, 2012/03/06 08:27:15]

I'm curious, what needs to be fixed?

[Ivan Posva, 2012/03/07 07:46:53]

Currently calling private methods through the Dart API is not supported.

[ahe, 2012/03/07 08:22:38]

I guess that by Dart API, you are referring to the native C++ API in the VM?

+String resolveScriptUri(String cwd, String scriptName) {
+  _logResolution("# Current working directory: $cwd");

[ahe, 2012/03/06 08:27:15]

This form of logging is expensive because you have to create the result of
string interpolation even when logging is disabled.

[Ivan Posva, 2012/03/07 07:46:53]

Will be removed once I am convinced that this works. So I am willing to eat the
cost for now.

+  _logResolution("# ScriptName: $scriptName");
+  var base = new Uri(scheme: "file", path: "$cwd/");

[ahe, 2012/03/06 08:27:15]

Appending / doesn't work for the root directory. See the code I have in
dart/frog/leg/io/io.dart.

[Ivan Posva, 2012/03/07 07:46:53]

The problem with io.dart in leg is that it is currently getting the
canonicalized path, which is not what we want, but I will check for a trailing
"/".

[ahe, 2012/03/07 08:22:38]

I meant to refer to how I handle trailing "/" in dart/frog/leg/io/io.dart. I
think you got that point.

+  var resolved = base.resolve(scriptName);
+  _logResolution("# Resolved to: $resolved");
+  return resolved.toString();
+}
+
+String resolveUri(String base, String userString) {
+  var baseUri = new Uri.fromString(base);
+  _logResolution("# Resolving: $userString from $base");
+  var resolved = baseUri.resolve(userString);
+  _logResolution("# Resolved to: $resolved");
+  return resolved.toString(); 
+}
+
+String filePathFromUri(String userUri) {
+  var uri = new Uri.fromString(userUri);
+  _logResolution("# Getting file path from: $uri");
+  if ("file" != uri.scheme) {
+    // Only handling file URIs in standalone binary.
+    _logResolution("# Not a file URI.");
+    throw "Not a file uri: $uri";
+  }
+  _logResolution("# Path: ${uri.path}");
+  return uri.path;
+}