Split the URI library across multiple files.

dart/lib/uri/uri.dart

Index: dart/lib/uri/uri.dart
diff --git a/dart/lib/uri/uri.dart b/dart/lib/uri/uri.dart
index a1856f7cfbf7f5c01e54d11ff810789ab05b0588..f35576b7b506514a5e66862e15298856a7dc8799 100644
--- a/dart/lib/uri/uri.dart
+++ b/dart/lib/uri/uri.dart
@@ -4,6 +4,8 @@
 
 #library('uri');
 
+#source('helpers.dart');
+
 /**
  * A parsed URI, inspired by Closure's [URI][] class. Implements [RFC-3986][].
  * [uri]: http://closure-library.googlecode.com/svn/docs/class_goog_Uri.html
@@ -188,27 +190,3 @@ class Uri {
     }
   }
 }
-
-String merge(String base, String reference) {
-  if (base == "") return "/$reference";
-  return "${base.substring(0, base.lastIndexOf("/") + 1)}$reference";
-}
-
-String removeDotSegments(String path) {
-  List<String> output = [];
-  bool appendSlash = false;
-  for (String segment in path.split("/")) {
-    appendSlash = false;
-    if (segment == "..") {
-      if (!output.isEmpty() &&
-          ((output.length != 1) || (output[0] != ""))) output.removeLast();
-      appendSlash = true;
-    } else if ("." == segment) {
-      appendSlash = true;
-    } else {
-      output.add(segment);
-    }
-  }
-  if (appendSlash) output.add("");
-  return Strings.join(output, "/");
-}