Replace non262-RegExp-shell.js definitions and then remove it

harness/sm/non262-RegExp-shell.js

@@ -1,261 +0,0 @@
-/* -*- tab-width: 2; 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/. */
-
-/*---
-defines: [testRegExp, makeExpectedMatch, checkRegExpMatch]
-allow_unused: True
----*/
-
-/*
- * Date: 07 February 2001
- *
- * Functionality common to RegExp testing -
- */
-//-----------------------------------------------------------------------------
-
-(function(global) {
-
-  var MSG_PATTERN = '\nregexp = ';
-  var MSG_STRING = '\nstring = ';
-  var MSG_EXPECT = '\nExpect: ';
-  var MSG_ACTUAL = '\nActual: ';
-  var ERR_LENGTH = '\nERROR !!! match arrays have different lengths:';
-  var ERR_MATCH = '\nERROR !!! regexp failed to give expected match array:';
-  var ERR_NO_MATCH = '\nERROR !!! regexp FAILED to match anything !!!';
-  var ERR_UNEXP_MATCH = '\nERROR !!! regexp MATCHED when we expected it to fail !!!';
-  var CHAR_LBRACKET = '[';
-  var CHAR_RBRACKET = ']';
-  var CHAR_QT_DBL = '"';
-  var CHAR_QT = "'";
-  var CHAR_NL = '\n';
-  var CHAR_COMMA = ',';
-  var CHAR_SPACE = ' ';
-  var TYPE_STRING = typeof 'abc';
-
-
-
-  global.testRegExp = function testRegExp(statuses, patterns, strings, actualmatches, expectedmatches)
-  {
-    var status = '';
-    var pattern = new RegExp();
-    var string = '';
-    var actualmatch = new Array();
-    var expectedmatch = new Array();
-    var state = '';
-    var lActual = -1;
-    var lExpect = -1;
-
-
-    for (var i=0; i != patterns.length; i++)
-    {
-      status = statuses[i];
-      pattern = patterns[i];
-      string = strings[i];
-      actualmatch=actualmatches[i];
-      expectedmatch=expectedmatches[i];
-      state = getState(status, pattern, string);
-
-      description = status;
-
-      if(actualmatch)
-      {
-        actual = formatArray(actualmatch);
-        if(expectedmatch)
-        {
-          // expectedmatch and actualmatch are arrays -
-          lExpect = expectedmatch.length;
-          lActual = actualmatch.length;
-
-          var expected = formatArray(expectedmatch);
-
-          if (lActual != lExpect)
-          {
-            reportCompare(lExpect, lActual,
-                          state + ERR_LENGTH +
-                          MSG_EXPECT + expected +
-                          MSG_ACTUAL + actual +
-                          CHAR_NL
-	                       );
-            continue;
-          }
-
-          // OK, the arrays have same length -
-          if (expected != actual)
-          {
-            reportCompare(expected, actual,
-                          state + ERR_MATCH +
-                          MSG_EXPECT + expected +
-                          MSG_ACTUAL + actual +
-                          CHAR_NL
-	                       );
-          }
-          else
-          {
-            reportCompare(expected, actual, state)
-	        }
-
-        }
-        else //expectedmatch is null - that is, we did not expect a match -
-        {
-          expected = expectedmatch;
-          reportCompare(expected, actual,
-                        state + ERR_UNEXP_MATCH +
-                        MSG_EXPECT + expectedmatch +
-                        MSG_ACTUAL + actual +
-                        CHAR_NL
-	                     );
-        }
-
-      }
-      else // actualmatch is null
-      {
-        if (expectedmatch)
-        {
-          actual = actualmatch;
-          reportCompare(expected, actual,
-                        state + ERR_NO_MATCH +
-                        MSG_EXPECT + expectedmatch +
-                        MSG_ACTUAL + actualmatch +
-                        CHAR_NL
-	                     );
-        }
-        else // we did not expect a match
-        {
-          // Being ultra-cautious. Presumably expectedmatch===actualmatch===null
-          expected = expectedmatch;
-          actual   = actualmatch;
-          reportCompare (expectedmatch, actualmatch, state);
-        }
-      }
-    }
-  }
-
-  function getState(status, pattern, string)
-  {
-    /*
-     * Escape \n's, etc. to make them LITERAL in the presentation string.
-     * We don't have to worry about this in |pattern|; such escaping is
-     * done automatically by pattern.toString(), invoked implicitly below.
-     *
-     * One would like to simply do: string = string.replace(/(\s)/g, '\$1').
-     * However, the backreference $1 is not a literal string value,
-     * so this method doesn't work.
-     *
-     * Also tried string = string.replace(/(\s)/g, escape('$1'));
-     * but this just inserts the escape of the literal '$1', i.e. '%241'.
-     */
-    string = string.replace(/\n/g, '\\n');
-    string = string.replace(/\r/g, '\\r');
-    string = string.replace(/\t/g, '\\t');
-    string = string.replace(/\v/g, '\\v');
-    string = string.replace(/\f/g, '\\f');
-
-    return (status + MSG_PATTERN + pattern + MSG_STRING + singleQuote(string));
-  }
-
-
-
-  /*
-   * If available, arr.toSource() gives more detail than arr.toString()
-   *
-   * var arr = Array(1,2,'3');
-   *
-   * arr.toSource()
-   * [1, 2, "3"]
-   *
-   * arr.toString()
-   * 1,2,3
-   *
-   * But toSource() doesn't exist in Rhino, so use our own imitation, below -
-   *
-   */
-  function formatArray(arr)
-  {
-    try
-    {
-      return arr.toSource();
-    }
-    catch(e)
-    {
-      return toSource(arr);
-    }
-  }
-
-
-  /*
-   * Imitate SpiderMonkey's arr.toSource() method:
-   *
-   * a) Double-quote each array element that is of string type
-   * b) Represent |undefined| and |null| by empty strings
-   * c) Delimit elements by a comma + single space
-   * d) Do not add delimiter at the end UNLESS the last element is |undefined|
-   * e) Add square brackets to the beginning and end of the string
-   */
-  function toSource(arr)
-  {
-    var delim = CHAR_COMMA + CHAR_SPACE;
-    var elt = '';
-    var ret = '';
-    var len = arr.length;
-
-    for (i=0; i<len; i++)
-    {
-      elt = arr[i];
-
-      switch(true)
-      {
-        case (typeof elt === TYPE_STRING) :
-        ret += doubleQuote(elt);
-        break;
-
-        case (elt === undefined || elt === null) :
-        break; // add nothing but the delimiter, below -
-
-        default:
-        ret += elt.toString();
-      }
-
-      if ((i < len-1) || (elt === undefined))
-        ret += delim;
-    }
-
-    return  CHAR_LBRACKET + ret + CHAR_RBRACKET;
-  }
-
-
-  function doubleQuote(text)
-  {
-    return CHAR_QT_DBL + text + CHAR_QT_DBL;
-  }
-
-
-  function singleQuote(text)
-  {
-    return CHAR_QT + text + CHAR_QT;
-  }
-
-  global.makeExpectedMatch = function makeExpectedMatch(arr, index, input) {
-    var expectedMatch = {
-      index: index,
-      input: input,
-      length: arr.length,
-    };
-
-    for (var i = 0; i < arr.length; ++i)
-      expectedMatch[i] = arr[i];
-
-    return expectedMatch;
-  }
-
-  global.checkRegExpMatch = function checkRegExpMatch(actual, expected) {
-    assertEq(actual.length, expected.length);
-    for (var i = 0; i < actual.length; ++i)
-      assertEq(actual[i], expected[i]);
-
-    assertEq(actual.index, expected.index);
-    assertEq(actual.input, expected.input);
-  }
-
-})(this);

test/staging/sm/RegExp/regress-576828.js

@@ -2,16 +2,16 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-RegExp-shell.js]
+includes: [compareArray.js]
-flags:
-  - noStrict
 description: |
   pending
 esid: pending
 ---*/
+
 var re = /(z\1){3}/;
 var str = 'zzz';
 var actual = re.exec(str);
-var expected = makeExpectedMatch(['zzz', 'z'], 0, str);
-checkRegExpMatch(actual, expected);
 
+assert.compareArray(actual, ['zzz', 'z']);
+assert.sameValue(actual.index, 0);
+assert.sameValue(actual.input, str);

test/staging/sm/RegExp/regress-613820-1.js

@@ -2,17 +2,17 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-RegExp-shell.js]
+includes: [compareArray.js]
-flags:
-  - noStrict
 description: |
   pending
 esid: pending
 ---*/
+
 /* Back reference is actually a forwards reference. */
 var re = /(\2(a)){2}/;
 var str = 'aaa';
 var actual = re.exec(str);
-var expected = makeExpectedMatch(['aa', 'a', 'a'], 0, str);
-checkRegExpMatch(actual, expected);
 
+assert.compareArray(actual, ['aa', 'a', 'a']);
+assert.sameValue(actual.index, 0);
+assert.sameValue(actual.input, str);

test/staging/sm/RegExp/regress-613820-2.js

@@ -2,17 +2,17 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-RegExp-shell.js]
+includes: [compareArray.js]
-flags:
-  - noStrict
 description: |
   pending
 esid: pending
 ---*/
+
 /* Resetting of inner capture groups across quantified capturing parens. */
 var re = /(?:(f)(o)(o)|(b)(a)(r))*/;
 var str = 'foobar';
 var actual = re.exec(str);
-var expected = makeExpectedMatch(['foobar', undefined, undefined, undefined, 'b', 'a', 'r'], 0, str);
-checkRegExpMatch(actual, expected);
 
+assert.compareArray(actual, ['foobar', undefined, undefined, undefined, 'b', 'a', 'r']);
+assert.sameValue(actual.index, 0);
+assert.sameValue(actual.input, str);

test/staging/sm/RegExp/regress-613820-3.js

@@ -2,17 +2,17 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-RegExp-shell.js]
+includes: [compareArray.js]
-flags:
-  - noStrict
 description: |
   pending
 esid: pending
 ---*/
+
 /* Capture group reset to undefined during second iteration, so backreference doesn't see prior result. */
 var re = /(?:^(a)|\1(a)|(ab)){2}/;
 var str = 'aab';
 var actual = re.exec(str);
-var expected = makeExpectedMatch(['aa', undefined, 'a', undefined], 0, str);
-checkRegExpMatch(actual, expected);
 
+assert.compareArray(actual, ['aa', undefined, 'a', undefined]);
+assert.sameValue(actual.index, 0);
+assert.sameValue(actual.input, str);