Rename some of the enum definitions inside classes to avoid conflict with the ObjectKind enum.

vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 2713 matching lines @@
   } else {
     return Api::NewError(
         "%s expects argument 'target' to be a class or library.",
         CURRENT_FUNC);
   }
 
 #if defined(DEBUG)
   if (!func.IsNull()) {
     // We only provide access to a subset of function kinds.
     RawFunction::Kind func_kind = func.kind();
-    ASSERT(func_kind == RawFunction::kFunction ||
+    ASSERT(func_kind == RawFunction::kRegularFunction ||
            func_kind == RawFunction::kGetterFunction ||
            func_kind == RawFunction::kSetterFunction ||
            func_kind == RawFunction::kConstructor ||
            func_kind == RawFunction::kAbstract);
   }
 #endif
   return Api::NewHandle(isolate, func.raw());
 }
 
 
@@ skipping 1039 matching lines @@
 
 // NOTE: Need to pass 'result' as a parameter here in order to avoid
 // warning: variable 'result' might be clobbered by 'longjmp' or 'vfork'
 // which shows up because of the use of setjmp.
 static void CompileSource(Isolate* isolate,
                           const Library& lib,
                           const String& url,
                           const String& source,
                           RawScript::Kind kind,
                           Dart_Handle* result) {
-  bool update_lib_status = (kind == RawScript::kScript ||
-                            kind == RawScript::kLibrary);
+  bool update_lib_status = (kind == RawScript::kScriptTag ||
+                            kind == RawScript::kLibraryTag);
   if (update_lib_status) {
     lib.SetLoadInProgress();
   }
   const Script& script =
       Script::Handle(isolate, Script::New(url, source, kind));
   ASSERT(isolate != NULL);
   const Error& error = Error::Handle(isolate, Compiler::Compile(lib, script));
   if (error.IsNull()) {
     *result = Api::NewHandle(isolate, lib.raw());
     if (update_lib_status) {
@@ skipping 30 matching lines @@
   }
   library = Library::New(url_str);
   library.set_debuggable(true);
   library.Register();
   isolate->object_store()->set_root_library(library);
   Dart_Handle result;
   CompileSource(isolate,
                 library,
                 url_str,
                 source_str,
-                RawScript::kScript,
+                RawScript::kScriptTag,
                 &result);
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScriptFromSnapshot(const uint8_t* buffer) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   TIMERSCOPE(time_script_loading);
   if (buffer == NULL) {
@@ skipping 180 matching lines @@
     // The source for this library has either been loaded or is in the
     // process of loading.  Return an error.
     return Api::NewError("%s: library '%s' has already been loaded.",
                          CURRENT_FUNC, url_str.ToCString());
   }
   Dart_Handle result;
   CompileSource(isolate,
                 library,
                 url_str,
                 source_str,
-                RawScript::kLibrary,
+                RawScript::kLibraryTag,
                 &result);
   // Propagate the error out right now.
   if (::Dart_IsError(result)) {
     return result;
   }
 
   // If this is the dart:builtin library, register it with the VM.
   if (url_str.Equals("dart:builtin")) {
     isolate->object_store()->set_builtin_library(library);
     const char* msg = CheckIsolateState(isolate);
@@ skipping 34 matching lines @@
   }
   const String& url_str = Api::UnwrapStringHandle(isolate, url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(isolate, source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, source, String);
   }
   Dart_Handle result;
-  CompileSource(isolate, lib, url_str, source_str, RawScript::kSource, &result);
+  CompileSource(isolate, lib, url_str, source_str,
+                RawScript::kSourceTag, &result);
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetNativeResolver(
     Dart_Handle library,
     Dart_NativeEntryResolver resolver) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Library& lib = Api::UnwrapLibraryHandle(isolate, library);
@@ skipping 35 matching lines @@
     *buffer_size = 0;
   }
 }
 
 
 DART_EXPORT void Dart_InitFlowGraphPrinting(FileWriterFunction function) {
   Dart::set_flow_graph_writer(function);
 }
 
 }  // namespace dart