- Modify dart_api.h to be a proper C API.

runtime/vm/bootstrap.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 "vm/bootstrap.h"
 
 #include "include/dart_api.h"
 
 #include "vm/bootstrap_natives.h"
 #include "vm/compiler.h"
@@ skipping 173 matching lines @@
 static Dart_Handle BootstrapLibraryTagHandler(Dart_LibraryTag tag,
                                               Dart_Handle library,
                                               Dart_Handle uri) {
   Isolate* isolate = Isolate::Current();
   if (!Dart_IsLibrary(library)) {
     return Dart_NewApiError("not a library");
   }
   if (!Dart_IsString(uri)) {
     return Dart_NewApiError("uri is not a string");
   }
-  if (tag == kCanonicalizeUrl) {
+  if (tag == Dart_kCanonicalizeUrl) {
     // In the boot strap loader we do not try and do any canonicalization.
     return uri;
   }
   const String& uri_str = Api::UnwrapStringHandle(isolate, uri);
   ASSERT(!uri_str.IsNull());
-  if (tag == kImportTag) {
+  if (tag == Dart_kImportTag) {
     // We expect the core bootstrap libraries to only import other
     // core bootstrap libraries.
     // We have precreated all the bootstrap library objects hence
     // we do not expect to be called back with the tag set to kImportTag.
     // The bootstrap process explicitly loads all the libraries one by one.
     return Dart_NewApiError("Invalid import of '%s' in a bootstrap library",
                             uri_str.ToCString());
   }
-  ASSERT(tag == kSourceTag);
+  ASSERT(tag == Dart_kSourceTag);
   const Library& lib = Api::UnwrapLibraryHandle(isolate, library);
   ASSERT(!lib.IsNull());
   return LoadPartSource(isolate, lib, uri_str);
 }
 
 
 static RawError* LoadPatchFiles(Isolate* isolate,
                                 const Library& lib,
                                 const String& patch_uri,
                                 const char** patch_files) {
@@ skipping 96 matching lines @@
   // Exit the Dart scope.
   Dart_ExitScope();
 
   // Restore the library tag handler for the isolate.
   isolate->set_library_tag_handler(saved_tag_handler);
 
   return error.raw();
 }
 
 }  // namespace dart