- Fix loading of dart:html. - Remove debug print in VM service.

runtime/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"
@@ skipping 21 matching lines @@
   { "dart:web_sql", websql_source_paths_, NULL, NULL, true },
   { "dart:svg", svg_source_paths_, NULL, NULL, true },
   { "dart:web_audio", webaudio_source_paths_, NULL, NULL, true },
 #endif  // defined(DART_NO_SNAPSHOT)
 
   // End marker.
   { NULL, NULL, NULL, NULL, false }
 };
 
 Dart_Port Builtin::load_port_ = ILLEGAL_PORT;
+const int Builtin::num_libs_ =
+    sizeof(Builtin::builtin_libraries_) / sizeof(Builtin::builtin_lib_props);
 
 // Patch all the specified patch files in the array 'patch_files' into the
 // library specified in 'library'.
 static void LoadPatchFiles(Dart_Handle library,
                            const char* patch_uri,
                            const char** patch_files) {
   for (intptr_t j = 0; patch_files[j] != NULL; j += 3) {
     Dart_Handle patch_src = DartUtils::ReadStringFromFile(patch_files[j + 1]);
     if (!Dart_IsString(patch_src)) {
       // In case reading the file caused an error, use the sources directly.
       const char* source = patch_files[j + 2];
       patch_src = Dart_NewStringFromUTF8(
           reinterpret_cast<const uint8_t*>(source), strlen(source));
     }
 
     // Prepend the patch library URI to form a unique script URI for the patch.
     intptr_t len = snprintf(NULL, 0, "%s/%s", patch_uri, patch_files[j]);
     char* patch_filename = DartUtils::ScopedCString(len + 1);
     snprintf(patch_filename, len + 1, "%s/%s", patch_uri, patch_files[j]);
     Dart_Handle patch_file_uri = DartUtils::NewString(patch_filename);
 
     DART_CHECK_VALID(Dart_LibraryLoadPatch(library, patch_file_uri, patch_src));
   }
 }
 
 
 Dart_Handle Builtin::Source(BuiltinLibraryId id) {
-  ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
-      kInvalidLibrary + 1);
-  ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
+  ASSERT(static_cast<int>(id) >= 0);
+  ASSERT(static_cast<int>(id) < num_libs_);
 
   // Try to read the source using the path specified for the uri.
   const char* uri = builtin_libraries_[id].url_;
   const char** source_paths = builtin_libraries_[id].source_paths_;
   return GetSource(source_paths, uri);
 }
 
 
 Dart_Handle Builtin::PartSource(BuiltinLibraryId id, const char* part_uri) {
-  ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
-      kInvalidLibrary + 1);
-  ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
+  ASSERT(static_cast<int>(id) >= 0);
+  ASSERT(static_cast<int>(id) < num_libs_);
 
   // Try to read the source using the path specified for the uri.
   const char** source_paths = builtin_libraries_[id].source_paths_;
   return GetSource(source_paths, part_uri);
 }
 
 
 Dart_Handle Builtin::GetSource(const char** source_paths, const char* uri) {
   if (source_paths == NULL) {
     return Dart_Null();  // No path mapping information exists for library.
@@ skipping 15 matching lines @@
 }
 
 
 void Builtin::SetNativeResolver(BuiltinLibraryId id) {
   UNREACHABLE();
 }
 
 
 Dart_Handle Builtin::LoadLibrary(Dart_Handle url, BuiltinLibraryId id) {
   ASSERT(static_cast<int>(id) >= 0);
-  ASSERT(static_cast<int>(id) < kInvalidLibrary);
+  ASSERT(static_cast<int>(id) < num_libs_);
 
   Dart_Handle library = Dart_LoadLibrary(url, Source(id), 0, 0);
   if (!Dart_IsError(library) && (builtin_libraries_[id].has_natives_)) {
     // Setup the native resolver for built in library functions.
     DART_CHECK_VALID(
         Dart_SetNativeResolver(library, NativeLookup, NativeSymbol));
   }
   if (builtin_libraries_[id].patch_url_ != NULL) {
     ASSERT(builtin_libraries_[id].patch_paths_ != NULL);
     LoadPatchFiles(library,
@@ skipping 12 matching lines @@
     }
     if (strcmp(url_string, builtin_libraries_[id].url_) == 0) {
       return static_cast<BuiltinLibraryId>(id);
     }
     id++;
   }
 }
 
 
 Dart_Handle Builtin::LoadAndCheckLibrary(BuiltinLibraryId id) {
-  ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
-      kInvalidLibrary + 1);
-  ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
+  ASSERT(static_cast<int>(id) >= 0);
+  ASSERT(static_cast<int>(id) < num_libs_);
+
   Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_);
   Dart_Handle library = Dart_LookupLibrary(url);
   if (Dart_IsError(library)) {
     library = LoadLibrary(url, id);
   }
   return library;
 }
 
 }  // namespace bin
 }  // namespace dart