Replace PushIfAbsent by a Stack object

src/js/json.js

 // Copyright 2009 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.
 
 (function(global, utils) {
 
 "use strict";
 
 %CheckIsBootstrapping();
 
 // -------------------------------------------------------------------
 // Imports
 
 var GlobalDate = global.Date;
 var GlobalJSON = global.JSON;
 var GlobalSet = global.Set;
 var InternalArray = utils.InternalArray;
 var MakeTypeError;
 var MaxSimple;
 var MinSimple;
 var ObjectHasOwnProperty;
+var Stack;
+var StackHas;
+var StackPop;
+var StackPush;
 var toStringTagSymbol = utils.ImportNow("to_string_tag_symbol");
 
 utils.Import(function(from) {
   MakeTypeError = from.MakeTypeError;
   MaxSimple = from.MaxSimple;
   MinSimple = from.MinSimple;
   ObjectHasOwnProperty = from.ObjectHasOwnProperty;
+  Stack = from.Stack;
+  StackHas = from.StackHas;
+  StackPop = from.StackPop;
+  StackPush = from.StackPush;
 });
 
 // -------------------------------------------------------------------
 
 function CreateDataProperty(o, p, v) {
   var desc = {value: v, enumerable: true, writable: true, configurable: true};
   return %reflect_define_property(o, p, desc);
 }
 
 
@@ skipping 32 matching lines @@
   var unfiltered = %ParseJson(text);
   if (IS_CALLABLE(reviver)) {
     return InternalizeJSONProperty({'': unfiltered}, '', reviver);
   } else {
     return unfiltered;
   }
 }
 
 
 function SerializeArray(value, replacer, stack, indent, gap) {
-  if (!%PushIfAbsent(stack, value)) throw MakeTypeError(kCircularStructure);
+  if (StackHas(stack, value)) throw MakeTypeError(kCircularStructure);
+  StackPush(stack, value);
   var stepback = indent;
   indent += gap;
   var partial = new InternalArray();
   var len = TO_LENGTH(value.length);
   for (var i = 0; i < len; i++) {
     var strP = JSONSerialize(%_NumberToString(i), value, replacer, stack,
                              indent, gap);
     if (IS_UNDEFINED(strP)) {
       strP = "null";
     }
     partial.push(strP);
   }
   var final;
   if (gap == "") {
     final = "[" + partial.join(",") + "]";
   } else if (partial.length > 0) {
     var separator = ",\n" + indent;
     final = "[\n" + indent + partial.join(separator) + "\n" +
         stepback + "]";
   } else {
     final = "[]";
   }
-  stack.pop();
+  StackPop(stack);
   return final;
 }
 
 
 function SerializeObject(value, replacer, stack, indent, gap) {
-  if (!%PushIfAbsent(stack, value)) throw MakeTypeError(kCircularStructure);
+  if (StackHas(stack, value)) throw MakeTypeError(kCircularStructure);
+  StackPush(stack, value);
   var stepback = indent;
   indent += gap;
   var partial = new InternalArray();
   if (IS_ARRAY(replacer)) {
     var length = replacer.length;
     for (var i = 0; i < length; i++) {
       var p = replacer[i];
       var strP = JSONSerialize(p, value, replacer, stack, indent, gap);
       if (!IS_UNDEFINED(strP)) {
         var member = %QuoteJSONString(p) + ":";
@@ skipping 18 matching lines @@
   var final;
   if (gap == "") {
     final = "{" + partial.join(",") + "}";
   } else if (partial.length > 0) {
     var separator = ",\n" + indent;
     final = "{\n" + indent + partial.join(separator) + "\n" +
         stepback + "}";
   } else {
     final = "{}";
   }
-  stack.pop();
+  StackPop(stack);
   return final;
 }
 
 
 function JSONSerialize(key, holder, replacer, stack, indent, gap) {
   var value = holder[key];
   if (IS_RECEIVER(value)) {
     var toJSON = value.toJSON;
     if (IS_CALLABLE(toJSON)) {
       value = %_Call(toJSON, value, key);
@@ skipping 74 matching lines @@
       gap = %_SubString(space, 0, 10);
     } else {
       gap = space;
     }
   } else {
     gap = "";
   }
   if (!IS_CALLABLE(replacer) && !property_list && !gap && !IS_PROXY(value)) {
     return %BasicJSONStringify(value);
   }
-  return JSONSerialize('', {'': value}, replacer, new InternalArray(), "", gap);
+  return JSONSerialize('', {'': value}, replacer, new Stack(), "", gap);
 }
 
 // -------------------------------------------------------------------
 
 %AddNamedProperty(GlobalJSON, toStringTagSymbol, "JSON", READ_ONLY | DONT_ENUM);
 
 // Set up non-enumerable properties of the JSON object.
 utils.InstallFunctions(GlobalJSON, DONT_ENUM, [
   "parse", JSONParse,
   "stringify", JSONStringify
@@ skipping 17 matching lines @@
   "toJSON", DateToJSON
 ]);
 
 // -------------------------------------------------------------------
 // JSON Builtins
 
 function JsonSerializeAdapter(key, object) {
   var holder = {};
   holder[key] = object;
   // No need to pass the actual holder since there is no replacer function.
-  return JSONSerialize(key, holder, UNDEFINED, new InternalArray(), "", "");
+  return JSONSerialize(key, holder, UNDEFINED, new Stack(), "", "");
 }
 
 %InstallToContext(["json_serialize_adapter", JsonSerializeAdapter]);
 
 })