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

vm/code_generator_test.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 "platform/assert.h"
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 #include "vm/ast.h"
 #include "vm/assembler.h"
@@ skipping 268 matching lines @@
 
 CODEGEN_TEST_GENERATE(StaticCallCodegen, test) {
   const char* kScriptChars =
       "class A {\n"
       "  static bar() { return 42; }\n"
       "  static fly() { return 5; }\n"
       "}\n";
 
   String& url = String::Handle(String::New("dart-test:CompileScript"));
   String& source = String::Handle(String::New(kScriptChars));
-  Script& script = Script::Handle(Script::New(url, source, RawScript::kSource));
+  Script& script = Script::Handle(Script::New(url,
+                                              source,
+                                              RawScript::kSourceTag));
   Library& lib = MakeTestLibrary("TestLib");
   EXPECT(CompilerTest::TestCompileScript(lib, script));
   EXPECT(ClassFinalizer::FinalizePendingClasses());
   Class& cls = Class::Handle(LookupClass(lib, "A"));
   EXPECT(!cls.IsNull());
 
   // 'bar' will not be compiled.
   String& function_bar_name = String::Handle(String::New("bar"));
   Function& function_bar =
       Function::ZoneHandle(cls.LookupStaticFunction(function_bar_name));
@@ skipping 24 matching lines @@
 
 CODEGEN_TEST_GENERATE(InstanceCallCodegen, test) {
   const char* kScriptChars =
       "class A {\n"
       "  A() {}\n"
       "  int bar() { return 42; }\n"
       "}\n";
 
   String& url = String::Handle(String::New("dart-test:CompileScript"));
   String& source = String::Handle(String::New(kScriptChars));
-  Script& script = Script::Handle(Script::New(url, source, RawScript::kSource));
+  Script& script = Script::Handle(Script::New(url,
+                                              source,
+                                              RawScript::kSourceTag));
   Library& lib = MakeTestLibrary("TestLib");
   EXPECT(CompilerTest::TestCompileScript(lib, script));
   EXPECT(ClassFinalizer::FinalizePendingClasses());
   Class& cls = Class::ZoneHandle(LookupClass(lib, "A"));
   EXPECT(!cls.IsNull());
 
   String& constructor_name = String::Handle(String::New("A."));
   Function& constructor =
       Function::ZoneHandle(cls.LookupConstructor(constructor_name));
   EXPECT(!constructor.IsNull());
@@ skipping 117 matching lines @@
 // Test allocation of dart objects.
 CODEGEN_TEST_GENERATE(AllocateNewObjectCodegen, test) {
   const char* kScriptChars =
       "class A {\n"
       "  A() {}\n"
       "  static bar() { return 42; }\n"
       "}\n";
 
   String& url = String::Handle(String::New("dart-test:CompileScript"));
   String& source = String::Handle(String::New(kScriptChars));
-  Script& script = Script::Handle(Script::New(url, source, RawScript::kSource));
+  Script& script = Script::Handle(Script::New(url,
+                                              source,
+                                              RawScript::kSourceTag));
   Library& lib = MakeTestLibrary("TestLib");
   EXPECT(CompilerTest::TestCompileScript(lib, script));
   EXPECT(ClassFinalizer::FinalizePendingClasses());
   Class& cls = Class::ZoneHandle(LookupClass(lib, "A"));
   EXPECT(!cls.IsNull());
 
   String& constructor_name = String::Handle(String::New("A."));
   Function& constructor =
       Function::ZoneHandle(cls.LookupConstructor(constructor_name));
   EXPECT(!constructor.IsNull());
@@ skipping 21 matching lines @@
   app_lib ^= libs.At(num_libs - 1);
   ASSERT(!app_lib.IsNull());
   const Class& cls = Class::Handle(
       app_lib.LookupClass(String::Handle(String::NewSymbol("A"))));
   EXPECT_EQ(cls.raw(), result.clazz());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32 || defined(TARGET_ARCH_X64)