Refactor ObjectGetOwnPropertyKeys to accept bitmask rather than boolean

src/v8natives.js

Index: src/v8natives.js
diff --git a/src/v8natives.js b/src/v8natives.js
index a522738b881b9042f4a3cc0a44e3ec76e022229e..98ff24cd7b34f9910430ed8491d51a6c05a0ee70 100644
--- a/src/v8natives.js
+++ b/src/v8natives.js
@@ -1038,16 +1038,15 @@ function ToNameArray(obj, trap, includeSymbols) {
 }
 
 
-function ObjectGetOwnPropertyKeys(obj, symbolsOnly) {
+function ObjectGetOwnPropertyKeys(obj, filter) {
   var nameArrays = new InternalArray();
-  var filter = symbolsOnly ?
-      PROPERTY_ATTRIBUTES_STRING | PROPERTY_ATTRIBUTES_PRIVATE_SYMBOL :
-      PROPERTY_ATTRIBUTES_SYMBOLIC;
+  filter = (filter || PROPERTY_ATTRIBUTES_NONE)

[rossberg, 2014/09/10 07:37:59]

Please remove the defaulting and make sure that it's always called with explicit
arguments.

[caitp (gmail), 2014/09/10 16:54:11]

`filter |= PROPERTY_ATTRIBUTES_PRIVATE_SYMBOL` would be semantically the same as
a default PRIVATE_SATTRIBUTES_NONE --- just that it's not clearly spelled out.

I think we do want to always filter out private symbols, since there's probably
never a time to ask for them this way (not in spec, and I can't think of a good
reason to do that)

I will change to |= just to make it shorter though.

+         | PROPERTY_ATTRIBUTES_PRIVATE_SYMBOL;
 
   // Find all the indexed properties.
 
   // Only get own element names if we want to include string keys.
-  if (!symbolsOnly) {
+  if ((filter & PROPERTY_ATTRIBUTES_STRING) === 0) {
     var ownElementNames = %GetOwnElementNames(obj);
     for (var i = 0; i < ownElementNames.length; ++i) {
       ownElementNames[i] = %_NumberToString(ownElementNames[i]);
@@ -1089,12 +1088,16 @@ function ObjectGetOwnPropertyKeys(obj, symbolsOnly) {
     var j = 0;
     for (var i = 0; i < propertyNames.length; ++i) {
       var name = propertyNames[i];
-      if (symbolsOnly) {
-        if (!IS_SYMBOL(name) || IS_PRIVATE(name)) continue;
+
+      if (IS_SYMBOL(name)) {
+        if ((filter & PROPERTY_ATTRIBUTES_SYMBOLIC) || IS_PRIVATE(name)) {
+          continue;
+        }
       } else {
-        if (IS_SYMBOL(name)) continue;
+        if (filter & PROPERTY_ATTRIBUTES_STRING) continue;
         name = ToString(name);
       }
+
       if (seenKeys[name]) continue;
       seenKeys[name] = true;
       propertyNames[j++] = name;
@@ -1118,7 +1121,7 @@ function ObjectGetOwnPropertyNames(obj) {
     return ToNameArray(names, "getOwnPropertyNames", false);
   }
 
-  return ObjectGetOwnPropertyKeys(obj, false);
+  return ObjectGetOwnPropertyKeys(obj, PROPERTY_ATTRIBUTES_SYMBOLIC);
 }