1 files changed, 275 insertions, 0 deletions
diff --git a/js/src/tests/non262/object/regress-90596-003.js b/js/src/tests/non262/object/regress-90596-003.js
new file mode 100644
index 0000000000..ea0c161592
--- /dev/null
+++ b/js/src/tests/non262/object/regress-90596-003.js
@@ -0,0 +1,275 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * Date: 28 August 2001
+ *
+ * SUMMARY: A [DontEnum] prop, if overridden, should appear in for-in loops.
+ * See http://bugzilla.mozilla.org/show_bug.cgi?id=90596
+ *
+ * NOTE: some inefficiencies in the test are made for the sake of readability.
+ * For example, we quote string values like "Hi" in lines like this:
+ *
+ *                    actual = enumerateThis(obj);
+ *                    expect = '{prop:"Hi"}';
+ *
+ * But enumerateThis(obj) gets literal value Hi for obj.prop, not
+ * literal "Hi".  We take care of all these details in the
+ * compactThis(), sortThis() functions.  Sorting properties
+ * alphabetically is necessary for the test to work in Rhino.
+ */
+//-----------------------------------------------------------------------------
+var UBound = 0;
+var BUGNUMBER = 90596;
+var summary = '[DontEnum] props (if overridden) should appear in for-in loops';
+var cnCOMMA = ',';
+var cnCOLON = ':';
+var cnLBRACE = '{';
+var cnRBRACE = '}';
+var status = '';
+var statusitems = [];
+var actual = '';
+var actualvalues = [];
+var expect= '';
+var expectedvalues = [];
+var obj = {};
+
+
+status = inSection(1);
+obj = {toString:9};
+actual = enumerateThis(obj);
+expect = '{toString:9}';
+addThis();
+
+status = inSection(2);
+obj = {hasOwnProperty:"Hi"};
+actual = enumerateThis(obj);
+expect = '{hasOwnProperty:"Hi"}';
+addThis();
+
+status = inSection(3);
+obj = {toString:9, hasOwnProperty:"Hi"};
+actual = enumerateThis(obj);
+expect = '{toString:9, hasOwnProperty:"Hi"}';
+addThis();
+
+status = inSection(4);
+obj = {prop1:1, toString:9, hasOwnProperty:"Hi"};
+actual = enumerateThis(obj);
+expect = '{prop1:1, toString:9, hasOwnProperty:"Hi"}';
+addThis();
+
+
+// TRY THE SAME THING IN EVAL CODE
+var s = '';
+
+status = inSection(5);
+s = 'obj = {toString:9}';
+eval(s);
+actual = enumerateThis(obj);
+expect = '{toString:9}';
+addThis();
+
+status = inSection(6);
+s = 'obj = {hasOwnProperty:"Hi"}';
+eval(s);
+actual = enumerateThis(obj);
+expect = '{hasOwnProperty:"Hi"}';
+addThis();
+
+status = inSection(7);
+s = 'obj = {toString:9, hasOwnProperty:"Hi"}';
+eval(s);
+actual = enumerateThis(obj);
+expect = '{toString:9, hasOwnProperty:"Hi"}';
+addThis();
+
+status = inSection(8);
+s = 'obj = {prop1:1, toString:9, hasOwnProperty:"Hi"}';
+eval(s);
+actual = enumerateThis(obj);
+expect = '{prop1:1, toString:9, hasOwnProperty:"Hi"}';
+addThis();
+
+
+// TRY THE SAME THING IN FUNCTION CODE
+function A()
+{
+  status = inSection(9);
+  var s = 'obj = {toString:9}';
+  eval(s);
+  actual = enumerateThis(obj);
+  expect = '{toString:9}';
+  addThis();
+}
+A();
+
+function B()
+{
+  status = inSection(10);
+  var s = 'obj = {hasOwnProperty:"Hi"}';
+  eval(s);
+  actual = enumerateThis(obj);
+  expect = '{hasOwnProperty:"Hi"}';
+  addThis();
+}
+B();
+
+function C()
+{
+  status = inSection(11);
+  var s = 'obj = {toString:9, hasOwnProperty:"Hi"}';
+  eval(s);
+  actual = enumerateThis(obj);
+  expect = '{toString:9, hasOwnProperty:"Hi"}';
+  addThis();
+}
+C();
+
+function D()
+{
+  status = inSection(12);
+  var s = 'obj = {prop1:1, toString:9, hasOwnProperty:"Hi"}';
+  eval(s);
+  actual = enumerateThis(obj);
+  expect = '{prop1:1, toString:9, hasOwnProperty:"Hi"}';
+  addThis();
+}
+D();
+
+
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+
+
+function enumerateThis(obj)
+{
+  var arr = new Array();
+
+  for (var prop in obj)
+  {
+    arr.push(prop + cnCOLON + obj[prop]);
+  }
+
+  var ret = addBraces(String(arr));
+  return ret;
+}
+
+
+function addBraces(text)
+{
+  return cnLBRACE + text + cnRBRACE;
+}
+
+
+/*
+ * Sort properties alphabetically so the test will work in Rhino
+ */
+function addThis()
+{
+  statusitems[UBound] = status;
+  actualvalues[UBound] = sortThis(actual);
+  expectedvalues[UBound] = sortThis(expect);
+  UBound++;
+}
+
+
+/*
+ * Takes a string of the form '{"c", "b", "a", 2}' and returns '{2,a,b,c}'
+ */
+function sortThis(sList)
+{
+  sList = compactThis(sList);
+  sList = stripBraces(sList);
+  var arr = sList.split(cnCOMMA);
+  arr = arr.sort();
+  var ret = String(arr);
+  ret = addBraces(ret);
+  return ret;
+}
+
+
+/*
+ * Strips out any whitespace or quotes from the text -
+ */
+function compactThis(text)
+{
+  var charCode = 0;
+  var ret = '';
+
+  for (var i=0; i<text.length; i++)
+  {
+    charCode = text.charCodeAt(i);
+
+    if (!isWhiteSpace(charCode) && !isQuote(charCode))
+      ret += text.charAt(i);
+  }
+
+  return ret;
+}
+
+
+function isWhiteSpace(charCode)
+{
+  switch (charCode)
+  {
+  case (0x0009):
+  case (0x000B):
+  case (0x000C):
+  case (0x0020):
+  case (0x000A):  // '\n'
+  case (0x000D):  // '\r'
+    return true;
+    break;
+
+  default:
+    return false;
+  }
+}
+
+
+function isQuote(charCode)
+{
+  switch (charCode)
+  {
+  case (0x0027): // single quote
+  case (0x0022): // double quote
+    return true;
+    break;
+
+  default:
+    return false;
+  }
+}
+
+
+/*
+ * strips off braces at beginning and end of text -
+ */
+function stripBraces(text)
+{
+  // remember to escape the braces...
+  var arr = text.match(/^\{(.*)\}$/);
+
+  // defend against a null match...
+  if (arr != null && arr[1] != null)
+    return arr[1];
+  return text;
+}
+
+
+function test()
+{
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+
+  for (var i=0; i<UBound; i++)
+  {
+    reportCompare(expectedvalues[i], actualvalues[i], statusitems[i]);
+  }
+}