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

vm/parser_test.cc

 // Copyright (c) 2011, 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/ast_printer.h"
 #include "vm/class_finalizer.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/parser.h"
@@ skipping 96 matching lines @@
       "  final f2;            \n"
       "  final int f3, f4;    \n"
       "  static String s1, s2;   \n"
       "  static final int s3 = 8675309;    \n"
       "  static bar(i, [var d = 5]) { return 77; } \n"
       "  static foo() native \"native_function_name\";        \n"
       "}  \n";
 
   String& url = String::Handle(String::New("dart-test:Parser_TopLevel"));
   String& source = String::Handle(String::New(script_chars));
-  Script& script = Script::Handle(Script::New(url, source, RawScript::kSource));
+  Script& script = Script::Handle(Script::New(url,
+                                              source,
+                                              RawScript::kSourceTag));
   Library& lib = Library::ZoneHandle(Library::CoreLibrary());
 
   script.Tokenize(String::Handle(String::New("")));
 
   Parser::ParseCompilationUnit(lib, script);
   EXPECT(ClassFinalizer::FinalizePendingClasses());
   CheckField(lib, "A", "f1", false, false);
   CheckField(lib, "A", "f2", false, true);
   CheckField(lib, "A", "f3", false, true);
   CheckField(lib, "A", "f4", false, true);
@@ skipping 23 matching lines @@
       "  static foo() { return 42; } \n"
       "  static baz(var i) { var q = 5; return i + q; } \n"
       "}   \n"
       "    \n"
       "class B {  \n"
       "  static bam(k) { return A.foo(); }   \n"
       "}   \n";
 
   String& url = String::Handle(String::New("dart-test:Parser_TopLevel"));
   String& source = String::Handle(String::New(script_chars));
-  Script& script = Script::Handle(Script::New(url, source, RawScript::kSource));
+  Script& script = Script::Handle(Script::New(url,
+                                              source,
+                                              RawScript::kSourceTag));
   Library& lib = Library::ZoneHandle(Library::CoreLibrary());
 
   script.Tokenize(String::Handle(String::New("")));
 
   Parser::ParseCompilationUnit(lib, script);
   EXPECT(ClassFinalizer::FinalizePendingClasses());
 
   DumpFunction(lib, "A", "foo");
   DumpFunction(lib, "A", "bar");
   DumpFunction(lib, "A", "baz");
   DumpFunction(lib, "B", "bam");
 }
 
 }  // namespace dart