- Add dart:json, dart:uri and dart:utf8 to the known and builtin libraries.

bin/main.cc

 // 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.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
@@ skipping 249 matching lines @@
   if (tag == kCanonicalizeUrl) {
     // If this is a Dart Scheme URL then it is not modified as it will be
     // handled by the VM internally.
     if (is_dart_scheme_url) {
       return url;
     }
     // Create a canonical path based on the including library and current url.
     return DartUtils::CanonicalizeURL(NULL, library, url_string);
   }
   if (is_dart_scheme_url) {
     // Handle imports of dart:io.

[siva, 2012/02/16 18:44:17]

The comment is invalid now, maybe
// handle imports of other built-in libraries present in the SDK.

[Ivan Posva, 2012/02/16 19:58:50]

Done.

     if (DartUtils::IsDartIOLibURL(url_string) && (tag == kImportTag)) {

[siva, 2012/02/16 18:44:17]

I don't think we need this (tag == kImportTag) check.
We have already checked above for KCanonicalizeUrl so just an
ASSERT above that tag == kImportTag would be sufficient.

[Ivan Posva, 2012/02/16 19:58:50]

Done.

       return Builtin::LoadLibrary(Builtin::kIOLibrary);
+    } else if (DartUtils::IsDartJsonLibURL(url_string) && (tag == kImportTag)) {
+      return Builtin::LoadLibrary(Builtin::kJsonLibrary);
+    } else if (DartUtils::IsDartUriLibURL(url_string) && (tag == kImportTag)) {
+      return Builtin::LoadLibrary(Builtin::kUriLibrary);
+    } else if (DartUtils::IsDartUtf8LibURL(url_string) && (tag == kImportTag)) {
+      return Builtin::LoadLibrary(Builtin::kUtf8Library);

[turnidge, 2012/02/16 17:42:02]

Do you notice that here we take a url and convert it to an id?  And then in
LoadLibrary we take that id and convert it back to a url?

I think that perhaps the ids are not useful.  Instead, I suggest:

- Make all apis in builtin.h take a url directly.
- Have LoadLibrary just return a Dart_Error() when we ask for an unknown lib.

That way we won't have to keep modifying main.cc every time a new lib is added.

[Ivan Posva, 2012/02/16 19:58:50]

Yes, I did notice this back and forth. But I decided to keep the current
structure and add the libraries we need at the moment. A big restructure of this
is needed anyway, but was outside of the scope of this change.

     } else {
       return Dart_Error("Do not know how to load '%s'", url_string);
     }
   }
   result = DartUtils::LoadSource(NULL,
                                  library,
                                  url,
                                  tag,
                                  url_string,
                                  import_map);
@@ skipping 327 matching lines @@
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate event handler.
   EventHandler::Terminate();
   // Terminate process exit-code handler.
   Process::TerminateExitCodeHandler();
 
   return 0;
 }