[cleanup] Introduce PropertyFilter

src/key-accumulator.cc

 // Copyright 2013 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.
 
 #include "src/key-accumulator.h"
 
 #include "src/elements.h"
 #include "src/factory.h"
 #include "src/isolate-inl.h"
 #include "src/objects-inl.h"
@@ skipping 81 matching lines @@
 
 }  // namespace
 
 bool KeyAccumulator::AddKey(Object* key, AddKeyConversion convert) {
   return AddKey(handle(key, isolate_), convert);
 }
 
 
 bool KeyAccumulator::AddKey(Handle<Object> key, AddKeyConversion convert) {
   if (key->IsSymbol()) {
-    if (filter_ == SKIP_SYMBOLS) return false;
+    if (filter_ & SKIP_SYMBOLS) return false;
+    if (Handle<Symbol>::cast(key)->is_private()) return false;
     return AddSymbolKey(key);
   }
   // Make sure we do not add keys to a proxy-level (see AddKeysFromProxy).
   DCHECK_LE(0, level_string_length_);
   // In some cases (e.g. proxies) we might get in String-converted ints which
   // should be added to the elements list instead of the properties. For
   // proxies we have to convert as well but also respect the original order.
   // Therefore we add a converted key to both sides
   if (convert == CONVERT_TO_ARRAY_INDEX || convert == PROXY_MAGIC) {
     uint32_t index = 0;
@@ skipping 101 matching lines @@
   AddKeys(array_like, PROXY_MAGIC);
   // Invert the current length to indicate a present proxy, so we can ignore
   // element keys for this level. Otherwise we would not fully respect the order
   // given by the proxy.
   level_string_length_ = -level_string_length_;
 }
 
 
 MaybeHandle<FixedArray> FilterProxyKeys(Isolate* isolate, Handle<JSProxy> owner,
                                         Handle<FixedArray> keys,
-                                        KeyFilter filter,
-                                        Enumerability enum_policy) {
-  if (filter == INCLUDE_SYMBOLS && enum_policy == IGNORE_ENUMERABILITY) {
+                                        PropertyFilter filter) {
+  if (filter == ALL_PROPERTIES) {
     // Nothing to do.
     return keys;
   }
   int store_position = 0;
   for (int i = 0; i < keys->length(); ++i) {
     Handle<Name> key(Name::cast(keys->get(i)), isolate);
-    if (filter == SKIP_SYMBOLS && key->IsSymbol()) continue;  // Skip this key.
-    if (enum_policy == RESPECT_ENUMERABILITY) {
+    if (key->IsSymbol()) {
+      if ((filter & SKIP_SYMBOLS) || Handle<Symbol>::cast(key)->is_private()) {
+        continue;  // Skip this key.
+      }
+    }
+    if (filter & ONLY_ENUMERABLE) {
       PropertyDescriptor desc;
       bool found =
           JSProxy::GetOwnPropertyDescriptor(isolate, owner, key, &desc);
       if (isolate->has_pending_exception()) return MaybeHandle<FixedArray>();
       if (!found || !desc.enumerable()) continue;  // Skip this key.
     }
     // Keep this key.
     if (store_position != i) {
       keys->set(store_position, *key);
     }
     store_position++;
   }
   if (store_position == 0) return isolate->factory()->empty_fixed_array();
   keys->Shrink(store_position);
   return keys;
 }
 
 
 // Returns "false" in case of exception, "true" on success.
 bool KeyAccumulator::AddKeysFromProxy(Handle<JSProxy> proxy,
-                                      Handle<FixedArray> keys, KeyFilter filter,
-                                      Enumerability enum_policy) {
+                                      Handle<FixedArray> keys) {
   ASSIGN_RETURN_ON_EXCEPTION_VALUE(
-      isolate_, keys,
-      FilterProxyKeys(isolate_, proxy, keys, filter, enum_policy), false);
+      isolate_, keys, FilterProxyKeys(isolate_, proxy, keys, filter_), false);
   // Proxies define a complete list of keys with no distinction of
   // elements and properties, which breaks the normal assumption for the
   // KeyAccumulator.
   AddKeys(keys, PROXY_MAGIC);
   // Invert the current length to indicate a present proxy, so we can ignore
   // element keys for this level. Otherwise we would not fully respect the order
   // given by the proxy.
   level_string_length_ = -level_string_length_;
   return true;
 }
@@ skipping 36 matching lines @@
     level_lengths_.push_back(level_symbol_length_);
   }
   elements_.push_back(new std::vector<uint32_t>());
   level_string_length_ = 0;
   level_symbol_length_ = 0;
 }
 
 
 }  // namespace internal
 }  // namespace v8