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

runtime/bin/gen_snapshot.cc

 // Copyright (c) 2013, 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.
 
 // Generate a snapshot file after loading all the scripts specified on the
 // command line.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ skipping 286 matching lines @@
   }
 
   if (!Dart_IsString(url)) {
     return Dart_Error("url is not a string");
   }
   const char* url_string = DartUtils::GetStringValue(url);
   const char* mapped_url_string = DartUtils::MapLibraryUrl(url_mapping,
                                                            url_string);
 
   Builtin::BuiltinLibraryId libraryBuiltinId = BuiltinId(library_url_string);
-  if (tag == kCanonicalizeUrl) {
+  if (tag == Dart_kCanonicalizeUrl) {
     if (mapped_url_string) {
       return url;
     }
     // Parts of internal libraries are handled internally.
     if (libraryBuiltinId != Builtin::kInvalidLibrary) {
       return url;
     }
     return ResolveUri(library_url_string, url_string);
   }
 
   Builtin::BuiltinLibraryId builtinId = BuiltinId(url_string);
   if (builtinId != Builtin::kInvalidLibrary) {
     // Special case for importing a builtin library.
-    if (tag == kImportTag) {
+    if (tag == Dart_kImportTag) {
       return Builtin::LoadAndCheckLibrary(builtinId);
     }
-    ASSERT(tag == kSourceTag);
+    ASSERT(tag == Dart_kSourceTag);
     return Dart_Error("Unable to part '%s' ", url_string);
   }
 
   if (libraryBuiltinId != Builtin::kInvalidLibrary) {
     // Special case for parting sources of a builtin library.
-    if (tag == kSourceTag) {
+    if (tag == Dart_kSourceTag) {
       return Dart_LoadSource(
           library, url, Builtin::PartSource(libraryBuiltinId, url_string));
     }
-    ASSERT(tag == kImportTag);
+    ASSERT(tag == Dart_kImportTag);
     return Dart_Error("Unable to import '%s' ", url_string);
   }
 
   Dart_Handle resolved_url = url;
   if (mapped_url_string != NULL) {
     // Mapped urls are relative to working directory.
     resolved_url = ResolveScriptUri(mapped_url_string);
     if (Dart_IsError(resolved_url)) {
       return resolved_url;
     }
@@ skipping 220 matching lines @@
   }
   return 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   return dart::bin::main(argc, argv);
 }