Clean up LookupIterator::Configuration naming

src/lookup.h

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_LOOKUP_H_
 #define V8_LOOKUP_H_
 
 #include "src/factory.h"
 #include "src/isolate.h"
 #include "src/objects.h"
 
 namespace v8 {
 namespace internal {
 
 class LookupIterator V8_FINAL BASE_EMBEDDED {
  public:
   enum Configuration {
     // Configuration bits.
-    CHECK_HIDDEN_PROPERTY = 1 << 0,
-    CHECK_DERIVED_PROPERTY = 1 << 1,
-    CHECK_INTERCEPTOR = 1 << 2,
-    CHECK_ACCESS_CHECK = 1 << 3,
+    kAccessCheck = 1 << 0,
+    kHidden = 1 << 1,
+    kInterceptor = 1 << 2,
+    kPrototypeChain = 1 << 3,
 
     // Convience combinations of bits.
-    CHECK_PROPERTY = 0,
-    CHECK_OWN = CHECK_ACCESS_CHECK | CHECK_INTERCEPTOR,
-    CHECK_HIDDEN_SKIP_INTERCEPTOR = CHECK_HIDDEN_PROPERTY | CHECK_ACCESS_CHECK,
-    CHECK_DERIVED_SKIP_INTERCEPTOR =
-        CHECK_HIDDEN_SKIP_INTERCEPTOR | CHECK_DERIVED_PROPERTY,
-    CHECK_DERIVED = CHECK_DERIVED_SKIP_INTERCEPTOR | CHECK_INTERCEPTOR,
-    CHECK_HIDDEN = CHECK_HIDDEN_SKIP_INTERCEPTOR | CHECK_INTERCEPTOR
+    OWN_PROPERTY = 0,
+    OWN_SKIP_INTERCEPTOR = kAccessCheck,
+    OWN = kAccessCheck | kInterceptor,
+    HIDDEN_PROPERTY = kHidden,
+    HIDDEN_SKIP_INTERCEPTOR = kAccessCheck | kHidden,
+    HIDDEN = kAccessCheck | kHidden | kInterceptor,
+    PROTOTYPE_CHAIN_PROPERTY = kHidden | kPrototypeChain,
+    PROTOTYPE_CHAIN_SKIP_INTERCEPTOR = kAccessCheck | kHidden | kPrototypeChain,
+    PROTOTYPE_CHAIN = kAccessCheck | kHidden | kPrototypeChain | kInterceptor
   };
 
   enum State {
     ACCESS_CHECK,
     INTERCEPTOR,
     JSPROXY,
     NOT_FOUND,
     PROPERTY,
     TRANSITION,
     // Set state_ to BEFORE_PROPERTY to ensure that the next lookup will be a
     // PROPERTY lookup.
     BEFORE_PROPERTY = INTERCEPTOR
   };
 
   enum PropertyKind {
     DATA,
     ACCESSOR
   };
 
   enum PropertyEncoding {
     DICTIONARY,
     DESCRIPTOR
   };
 
   LookupIterator(Handle<Object> receiver, Handle<Name> name,
-                 Configuration configuration = CHECK_DERIVED)
+                 Configuration configuration = PROTOTYPE_CHAIN)
       : configuration_(ComputeConfiguration(configuration, name)),
         state_(NOT_FOUND),
         property_kind_(DATA),
         property_encoding_(DESCRIPTOR),
         property_details_(NONE, NORMAL, Representation::None()),
         isolate_(name->GetIsolate()),
         name_(name),
         maybe_receiver_(receiver),
         number_(DescriptorArray::kNotFound) {
     Handle<JSReceiver> root = GetRoot();
     holder_map_ = handle(root->map(), isolate_);
     maybe_holder_ = root;
     Next();
   }
 
   LookupIterator(Handle<Object> receiver, Handle<Name> name,
                  Handle<JSReceiver> holder,
-                 Configuration configuration = CHECK_DERIVED)
+                 Configuration configuration = PROTOTYPE_CHAIN)
       : configuration_(ComputeConfiguration(configuration, name)),
         state_(NOT_FOUND),
         property_kind_(DATA),
         property_encoding_(DESCRIPTOR),
         property_details_(NONE, NORMAL, Representation::None()),
         isolate_(name->GetIsolate()),
         name_(name),
         holder_map_(holder->map(), isolate_),
         maybe_receiver_(receiver),
         maybe_holder_(holder),
@@ skipping 98 matching lines @@
 
   bool IsBootstrapping() const;
 
   // Methods that fetch data from the holder ensure they always have a holder.
   // This means the receiver needs to be present as opposed to just the receiver
   // map. Other objects in the prototype chain are transitively guaranteed to be
   // present via the receiver map.
   bool is_guaranteed_to_have_holder() const {
     return !maybe_receiver_.is_null();
   }
+  bool check_access_check() const {
+    return (configuration_ & kAccessCheck) != 0;
+  }
+  bool check_hidden() const { return (configuration_ & kHidden) != 0; }
   bool check_interceptor() const {
-    return !IsBootstrapping() && (configuration_ & CHECK_INTERCEPTOR) != 0;
+    return !IsBootstrapping() && (configuration_ & kInterceptor) != 0;
   }
-  bool check_derived() const {
-    return (configuration_ & CHECK_DERIVED_PROPERTY) != 0;
-  }
-  bool check_hidden() const {
-    return (configuration_ & CHECK_HIDDEN_PROPERTY) != 0;
-  }
-  bool check_access_check() const {
-    return (configuration_ & CHECK_ACCESS_CHECK) != 0;
+  bool check_prototype_chain() const {
+    return (configuration_ & kPrototypeChain) != 0;
   }
   int descriptor_number() const {
     DCHECK(has_property_);
     DCHECK_EQ(DESCRIPTOR, property_encoding_);
     return number_;
   }
   int dictionary_entry() const {
     DCHECK(has_property_);
     DCHECK_EQ(DICTIONARY, property_encoding_);
     return number_;
   }
 
   static Configuration ComputeConfiguration(
       Configuration configuration, Handle<Name> name) {
     if (name->IsOwn()) {
-      return static_cast<Configuration>(configuration & CHECK_HIDDEN);
+      return static_cast<Configuration>(configuration & HIDDEN);
     } else {
       return configuration;
     }
   }
 
   // If configuration_ becomes mutable, update
   // HolderIsReceiverOrHiddenPrototype.
   Configuration configuration_;
   State state_;
   bool has_property_;
   PropertyKind property_kind_;
   PropertyEncoding property_encoding_;
   PropertyDetails property_details_;
   Isolate* isolate_;
   Handle<Name> name_;
   Handle<Map> holder_map_;
   Handle<Map> transition_map_;
   MaybeHandle<Object> maybe_receiver_;
   MaybeHandle<JSReceiver> maybe_holder_;
 
   int number_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_LOOKUP_H_