Enums cleanup.

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 3655 matching lines @@
   }
   for (intptr_t i = 0, j = prefix_length; i < accessor_name_len; i++, j++) {
     if (name.CharAt(j) != accessor_name.CharAt(i)) {
       return false;
     }
   }
   return true;
 }
 
 
-RawFunction* Class::CheckFunctionType(const Function& func, intptr_t type) {
-  if (type == kInstance) {
+RawFunction* Class::CheckFunctionType(const Function& func, MemberKind kind) {
+  if (kind == kInstance) {
     if (func.IsDynamicFunction()) {
       return func.raw();
     }
-  } else if (type == kStatic) {
+  } else if (kind == kStatic) {
     if (func.IsStaticFunction()) {
       return func.raw();
     }
-  } else if (type == kConstructor) {
+  } else if (kind == kConstructor) {
     if (func.IsConstructor()) {
       ASSERT(!func.is_static());
       return func.raw();
     }
-  } else if (type == kFactory) {
+  } else if (kind == kFactory) {
     if (func.IsFactory()) {
       ASSERT(func.is_static());
       return func.raw();
     }
-  } else if (type == kAny) {
+  } else if (kind == kAny) {
     return func.raw();
   }
   return Function::null();
 }
 
 
-RawFunction* Class::LookupFunction(const String& name, intptr_t type) const {
+RawFunction* Class::LookupFunction(const String& name, MemberKind kind) const {
   Isolate* isolate = Isolate::Current();
   if (EnsureIsFinalized(isolate) != Error::null()) {
     return Function::null();
   }
   REUSABLE_ARRAY_HANDLESCOPE(isolate);
   REUSABLE_FUNCTION_HANDLESCOPE(isolate);
   Array& funcs = isolate->ArrayHandle();
   funcs ^= functions();
   ASSERT(!funcs.IsNull());
   const intptr_t len = funcs.Length();
   Function& function = isolate->FunctionHandle();
   if (name.IsSymbol()) {
     // Quick Symbol compare.
     NoGCScope no_gc;
     for (intptr_t i = 0; i < len; i++) {
       function ^= funcs.At(i);
       if (function.name() == name.raw()) {
-        return CheckFunctionType(function, type);
+        return CheckFunctionType(function, kind);
       }
     }
   } else {
     REUSABLE_STRING_HANDLESCOPE(isolate);
     String& function_name = isolate->StringHandle();
     for (intptr_t i = 0; i < len; i++) {
       function ^= funcs.At(i);
       function_name ^= function.name();
       if (function_name.Equals(name)) {
-        return CheckFunctionType(function, type);
+        return CheckFunctionType(function, kind);
       }
     }
   }
   // No function found.
   return Function::null();
 }
 
 
 RawFunction* Class::LookupFunctionAllowPrivate(const String& name,
-                                               intptr_t type) const {
+                                               MemberKind kind) const {
   Isolate* isolate = Isolate::Current();
   if (EnsureIsFinalized(isolate) != Error::null()) {
     return Function::null();
   }
   REUSABLE_ARRAY_HANDLESCOPE(isolate);
   REUSABLE_FUNCTION_HANDLESCOPE(isolate);
   REUSABLE_STRING_HANDLESCOPE(isolate);
   Array& funcs = isolate->ArrayHandle();
   funcs ^= functions();
   ASSERT(!funcs.IsNull());
   const intptr_t len = funcs.Length();
   Function& function = isolate->FunctionHandle();
   String& function_name = isolate->StringHandle();
   for (intptr_t i = 0; i < len; i++) {
     function ^= funcs.At(i);
     function_name ^= function.name();
     if (String::EqualsIgnoringPrivateKey(function_name, name)) {
-      return CheckFunctionType(function, type);
+      return CheckFunctionType(function, kind);
     }
   }
   // No function found.
   return Function::null();
 }
 
 
 RawFunction* Class::LookupGetterFunction(const String& name) const {
   return LookupAccessorFunction(kGetterPrefix, kGetterPrefixLength, name);
 }
@@ skipping 66 matching lines @@
 RawField* Class::LookupStaticField(const String& name) const {
   return LookupField(name, kStatic);
 }
 
 
 RawField* Class::LookupField(const String& name) const {
   return LookupField(name, kAny);
 }
 
 
-RawField* Class::LookupField(const String& name, intptr_t type) const {
+RawField* Class::LookupField(const String& name, MemberKind kind) const {
   Isolate* isolate = Isolate::Current();
   if (EnsureIsFinalized(isolate) != Error::null()) {
     return Field::null();
   }
   REUSABLE_ARRAY_HANDLESCOPE(isolate);
   REUSABLE_FIELD_HANDLESCOPE(isolate);
   REUSABLE_STRING_HANDLESCOPE(isolate);
   Array& flds = isolate->ArrayHandle();
   flds ^= fields();
   ASSERT(!flds.IsNull());
   intptr_t len = flds.Length();
   Field& field = isolate->FieldHandle();
   String& field_name = isolate->StringHandle();
   for (intptr_t i = 0; i < len; i++) {
     field ^= flds.At(i);
     field_name ^= field.name();
     if (String::EqualsIgnoringPrivateKey(field_name, name)) {
-      if (type == kInstance) {
+      if (kind == kInstance) {
         if (!field.is_static()) {
           return field.raw();
         }
-      } else if (type == kStatic) {
+      } else if (kind == kStatic) {
         if (field.is_static()) {
           return field.raw();
         }
-      } else if (type == kAny) {
+      } else if (kind == kAny) {
         return field.raw();
       }
       return Field::null();
     }
   }
   // No field found.
   return Field::null();
 }
 
 
@@ skipping 14787 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart