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

bin/builtin.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 <stdio.h>
 
 #include "include/dart_api.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 
 static void SetupCorelibImports(Dart_Handle builtin_lib) {
   // Lookup the core libraries and import the builtin library into them.
   Dart_Handle url = Dart_NewString(DartUtils::kCoreLibURL);
   Dart_Handle core_lib = Dart_LookupLibrary(url);
   DART_CHECK_VALID(core_lib);
   DART_CHECK_VALID(Dart_LibraryImportLibrary(core_lib, builtin_lib));
 
   url = Dart_NewString(DartUtils::kCoreImplLibURL);
   Dart_Handle coreimpl_lib = Dart_LookupLibrary(url);
   DART_CHECK_VALID(coreimpl_lib);
   DART_CHECK_VALID(Dart_LibraryImportLibrary(coreimpl_lib, builtin_lib));
 }
 
 
 Dart_Handle Builtin::Source(BuiltinLibraryId id) {
   Dart_Handle source;
-  if (id == kBuiltinLibrary) {
-    source = Dart_NewString(Builtin::builtin_source_);
-  } else {
-    ASSERT(id == kIOLibrary);
-    source = Dart_NewString(Builtin::io_source_);
+  switch (id) {
+    case kBuiltinLibrary:
+      source = Dart_NewString(Builtin::builtin_source_);
+      break;
+    case kIOLibrary:
+      source = Dart_NewString(Builtin::io_source_);
+      break;
+    case kJsonLibrary:
+      source = Dart_NewString(Builtin::json_source_);
+      break;
+    case kUriLibrary:
+      source = Dart_NewString(Builtin::uri_source_);
+      break;
+    case kUtf8Library:
+      source = Dart_NewString(Builtin::utf8_source_);
+      break;
+    default:
+      return Dart_Error("Unknown builtin source requested.");
   }
   return source;
 }
 
 
 void Builtin::SetupLibrary(Dart_Handle library, BuiltinLibraryId id) {
   if (id == kBuiltinLibrary) {
     // Setup core lib, builtin import structure.
     SetupCorelibImports(library);
   }
   // Setup the native resolver for built in library functions.
   DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));

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

Do all these libraries need this native hookup by default?

I don't think json, uri, utf8 have any native methods in their current form.

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

Good point, I will only add the native resolve to builtin and io.

 }
 
 
 Dart_Handle Builtin::LoadLibrary(BuiltinLibraryId id) {
   Dart_Handle url;
-  if (id == kBuiltinLibrary) {
-    url = Dart_NewString(DartUtils::kBuiltinLibURL);
-  } else {
-    ASSERT(id == kIOLibrary);
-    url = Dart_NewString(DartUtils::kIOLibURL);
+  switch (id) {
+    case kBuiltinLibrary:
+      url = Dart_NewString(DartUtils::kBuiltinLibURL);
+      break;
+    case kIOLibrary:
+      url = Dart_NewString(DartUtils::kIOLibURL);
+      break;
+    case kJsonLibrary:
+      url = Dart_NewString(DartUtils::kJsonLibURL);
+      break;
+    case kUriLibrary:
+      url = Dart_NewString(DartUtils::kUriLibURL);
+      break;
+    case kUtf8Library:
+      url = Dart_NewString(DartUtils::kUtf8LibURL);
+      break;
+    default:
+      return Dart_Error("Unknown builtin library requested.");

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

This switch can go away if we get rid of ids.  Instead, we would just rely on
Source to return the Dart_Error when the library was unknown.

See my comment in main.cc

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

I would go for a table driven scheme for this, we have a table of uri, source,
native_fields etc. characteristics and implement the rest of the code
generically using the table. That way just an addition to the table should be
sufficient
(We could even generate the table from the build rules possibly).

On 2012/02/16 17:42:02, turnidge wrote:

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

I agree with you both that the way we are collecting the sources for these
libraries and putting them into both bootstrap or builtin should be improved. I
do think I have a solution for simplifying all of this, but I need to sit down
and study the capabilities of gyp a bit more in order to avoid the "one big
source file" problem.

On 2012/02/16 18:44:17, asiva wrote:

   }
   Dart_Handle library = Dart_LookupLibrary(url);
   if (Dart_IsError(library)) {
     Dart_Handle import_map = Dart_NewList(0);
     library = Dart_LoadLibrary(url, Source(id), import_map);
     if (!Dart_IsError(library)) {
       SetupLibrary(library, id);
     }
   }
   DART_CHECK_VALID(library);
   return library;
 }
 
 
 void Builtin::ImportLibrary(Dart_Handle library, BuiltinLibraryId id) {
   Dart_Handle imported_library = LoadLibrary(id);
   // Import the library into current library.
   DART_CHECK_VALID(Dart_LibraryImportLibrary(library, imported_library));
 }