diff --git a/test/built-ins/RegExp/named-groups/groups-properties.js b/test/built-ins/RegExp/named-groups/groups-properties.js index 9d7aa66f2e..3ca63eacb2 100644 --- a/test/built-ins/RegExp/named-groups/groups-properties.js +++ b/test/built-ins/RegExp/named-groups/groups-properties.js @@ -15,9 +15,8 @@ info: | ---*/ // Properties created on result.groups in textual order. -assert(compareArray(["fst", "snd"], - Object.getOwnPropertyNames( - /(?.)|(?.)/u.exec("abcd").groups))); +assert.compareArray(["fst", "snd"], Object.getOwnPropertyNames( + /(?.)|(?.)/u.exec("abcd").groups)); // Properties are created with Define, not Set let counter = 0; diff --git a/test/built-ins/RegExp/named-groups/lookbehind.js b/test/built-ins/RegExp/named-groups/lookbehind.js index e3926bc97e..2349e52511 100644 --- a/test/built-ins/RegExp/named-groups/lookbehind.js +++ b/test/built-ins/RegExp/named-groups/lookbehind.js @@ -9,38 +9,37 @@ includes: [compareArray.js] ---*/ // Unicode mode -assert(compareArray(["f", "c"], "abcdef".match(/(?<=(?\w){3})f/u))); +assert.compareArray(["f", "c"], "abcdef".match(/(?<=(?\w){3})f/u)); assert.sameValue("c", "abcdef".match(/(?<=(?\w){3})f/u).groups.a); assert.sameValue("b", "abcdef".match(/(?<=(?\w){4})f/u).groups.a); assert.sameValue("a", "abcdef".match(/(?<=(?\w)+)f/u).groups.a); assert.sameValue(null, "abcdef".match(/(?<=(?\w){6})f/u)); -assert(compareArray(["f", ""], "abcdef".match(/((?<=\w{3}))f/u))); -assert(compareArray(["f", ""], "abcdef".match(/(?(?<=\w{3}))f/u))); +assert.compareArray(["f", ""], "abcdef".match(/((?<=\w{3}))f/u)); +assert.compareArray(["f", ""], "abcdef".match(/(?(?<=\w{3}))f/u)); -assert(compareArray(["f", undefined], "abcdef".match(/(?\d){3})f/u))); +assert.compareArray(["f", undefined], "abcdef".match(/(?\d){3})f/u)); assert.sameValue(null, "abcdef".match(/(?\D){3})f/u)); -assert(compareArray(["f", undefined], "abcdef".match(/(?\D){3})f|f/u))); -assert(compareArray(["f", undefined], "abcdef".match(/(?(?\D){3})f|f/u)); +assert.compareArray(["f", undefined], "abcdef".match(/(?(?\w){3})f/))); +assert.compareArray(["f", "c"], "abcdef".match(/(?<=(?\w){3})f/)); assert.sameValue("c", "abcdef".match(/(?<=(?\w){3})f/).groups.a); assert.sameValue("b", "abcdef".match(/(?<=(?\w){4})f/).groups.a); assert.sameValue("a", "abcdef".match(/(?<=(?\w)+)f/).groups.a); assert.sameValue(null, "abcdef".match(/(?<=(?\w){6})f/)); -assert(compareArray(["f", ""], "abcdef".match(/((?<=\w{3}))f/))); -assert(compareArray(["f", ""], "abcdef".match(/(?(?<=\w{3}))f/))); +assert.compareArray(["f", ""], "abcdef".match(/((?<=\w{3}))f/)); +assert.compareArray(["f", ""], "abcdef".match(/(?(?<=\w{3}))f/)); -assert(compareArray(["f", undefined], "abcdef".match(/(?\d){3})f/))); +assert.compareArray(["f", undefined], "abcdef".match(/(?\d){3})f/)); assert.sameValue(null, "abcdef".match(/(?\D){3})f/)); -assert(compareArray(["f", undefined], "abcdef".match(/(?\D){3})f|f/))); -assert(compareArray(["f", undefined], "abcdef".match(/(?(?\D){3})f|f/)); +assert.compareArray(["f", undefined], "abcdef".match(/(?(?.)|(?.))/u.exec("abcd").groups))); +assert.compareArray(["fst", "snd"], Object.getOwnPropertyNames( + /(?<=(?.)|(?.))/u.exec("abcd").groups)); diff --git a/test/built-ins/RegExp/named-groups/non-unicode-match.js b/test/built-ins/RegExp/named-groups/non-unicode-match.js index 7904c75e43..aead1e3165 100644 --- a/test/built-ins/RegExp/named-groups/non-unicode-match.js +++ b/test/built-ins/RegExp/named-groups/non-unicode-match.js @@ -8,36 +8,35 @@ features: [regexp-named-groups] includes: [compareArray.js] ---*/ -assert(compareArray(["a", "a"], "bab".match(/(?a)/))); -assert(compareArray(["a", "a"], "bab".match(/(?a)/))); -assert(compareArray(["a", "a"], "bab".match(/(?<_>a)/))); -assert(compareArray(["a", "a"], "bab".match(/(?<$>a)/))); -assert(compareArray(["bab", "a"], "bab".match(/.(?<$>a)./))); -assert(compareArray(["bab", "a", "b"], "bab".match(/.(?a)(.)/))); -assert(compareArray(["bab", "a", "b"], "bab".match(/.(?a)(?.)/))); -assert(compareArray(["bab", "ab"], "bab".match(/.(?\w\w)/))); -assert(compareArray(["bab", "bab"], "bab".match(/(?\w\w\w)/))); -assert(compareArray(["bab", "ba", "b"], "bab".match(/(?\w\w)(?\w)/))); +assert.compareArray(["a", "a"], "bab".match(/(?a)/)); +assert.compareArray(["a", "a"], "bab".match(/(?a)/)); +assert.compareArray(["a", "a"], "bab".match(/(?<_>a)/)); +assert.compareArray(["a", "a"], "bab".match(/(?<$>a)/)); +assert.compareArray(["bab", "a"], "bab".match(/.(?<$>a)./)); +assert.compareArray(["bab", "a", "b"], "bab".match(/.(?a)(.)/)); +assert.compareArray(["bab", "a", "b"], "bab".match(/.(?a)(?.)/)); +assert.compareArray(["bab", "ab"], "bab".match(/.(?\w\w)/)); +assert.compareArray(["bab", "bab"], "bab".match(/(?\w\w\w)/)); +assert.compareArray(["bab", "ba", "b"], "bab".match(/(?\w\w)(?\w)/)); let {a, b, c} = /(?.)(?.)(?.)\k\k\k/.exec("abccba").groups; assert.sameValue(a, "a"); assert.sameValue(b, "b"); assert.sameValue(c, "c"); -assert(compareArray("bab".match(/(a)/), "bab".match(/(?a)/))); -assert(compareArray("bab".match(/(a)/), "bab".match(/(?a)/))); -assert(compareArray("bab".match(/(a)/), "bab".match(/(?<_>a)/))); -assert(compareArray("bab".match(/(a)/), "bab".match(/(?<$>a)/))); -assert(compareArray("bab".match(/.(a)./), "bab".match(/.(?<$>a)./))); -assert(compareArray("bab".match(/.(a)(.)/), "bab".match(/.(?a)(.)/))); -assert(compareArray("bab".match(/.(a)(.)/), "bab".match(/.(?a)(?.)/))); -assert(compareArray("bab".match(/.(\w\w)/), "bab".match(/.(?\w\w)/))); -assert(compareArray("bab".match(/(\w\w\w)/), "bab".match(/(?\w\w\w)/))); -assert(compareArray("bab".match(/(\w\w)(\w)/), "bab".match(/(?\w\w)(?\w)/))); +assert.compareArray("bab".match(/(a)/), "bab".match(/(?a)/)); +assert.compareArray("bab".match(/(a)/), "bab".match(/(?a)/)); +assert.compareArray("bab".match(/(a)/), "bab".match(/(?<_>a)/)); +assert.compareArray("bab".match(/(a)/), "bab".match(/(?<$>a)/)); +assert.compareArray("bab".match(/.(a)./), "bab".match(/.(?<$>a)./)); +assert.compareArray("bab".match(/.(a)(.)/), "bab".match(/.(?a)(.)/)); +assert.compareArray("bab".match(/.(a)(.)/), "bab".match(/.(?a)(?.)/)); +assert.compareArray("bab".match(/.(\w\w)/), "bab".match(/.(?\w\w)/)); +assert.compareArray("bab".match(/(\w\w\w)/), "bab".match(/(?\w\w\w)/)); +assert.compareArray("bab".match(/(\w\w)(\w)/), "bab".match(/(?\w\w)(?\w)/)); -assert(compareArray(["bab", "b"], "bab".match(/(?b).\1/))); -assert(compareArray(["baba", "b", "a"], "baba".match(/(.)(?a)\1\2/))); -assert(compareArray(["baba", "b", "a", "b", "a"], - "baba".match(/(.)(?a)(?\1)(\2)/))); -assert(compareArray(["<)a/))); -assert(compareArray([">a", ">"], ">a".match(/(?>)a/))); +assert.compareArray(["bab", "b"], "bab".match(/(?b).\1/)); +assert.compareArray(["baba", "b", "a"], "baba".match(/(.)(?a)\1\2/)); +assert.compareArray(["baba", "b", "a", "b", "a"], "baba".match(/(.)(?a)(?\1)(\2)/)); +assert.compareArray(["<)a/)); +assert.compareArray([">a", ">"], ">a".match(/(?>)a/)); diff --git a/test/built-ins/RegExp/named-groups/non-unicode-references.js b/test/built-ins/RegExp/named-groups/non-unicode-references.js index 33d62a3f0a..237a596a6b 100644 --- a/test/built-ins/RegExp/named-groups/non-unicode-references.js +++ b/test/built-ins/RegExp/named-groups/non-unicode-references.js @@ -9,23 +9,23 @@ includes: [compareArray.js] ---*/ // Named references. -assert(compareArray(["bab", "b"], "bab".match(/(?.).\k/))); +assert.compareArray(["bab", "b"], "bab".match(/(?.).\k/)); assert.sameValue(null, "baa".match(/(?.).\k/)); // Reference inside group. -assert(compareArray(["bab", "b"], "bab".match(/(?\k\w)../))); +assert.compareArray(["bab", "b"], "bab".match(/(?\k\w)../)); assert.sameValue("b", "bab".match(/(?\k\w)../).groups.a); // Reference before group. -assert(compareArray(["bab", "b"], "bab".match(/\k(?b)\w\k/))); +assert.compareArray(["bab", "b"], "bab".match(/\k(?b)\w\k/)); assert.sameValue("b", "bab".match(/\k(?b)\w\k/).groups.a); -assert(compareArray(["bab", "b", "a"], "bab".match(/(?b)\k(?a)\k/))); +assert.compareArray(["bab", "b", "a"], "bab".match(/(?b)\k(?a)\k/)); let {a, b} = "bab".match(/(?b)\k(?a)\k/).groups; assert.sameValue(a, "a"); assert.sameValue(b, "b"); -assert(compareArray(["bab", "b"], "bab".match(/\k(?b)\w\k/))); -assert(compareArray(["bab", "b", "a"], "bab".match(/(?b)\k(?a)\k/))); +assert.compareArray(["bab", "b"], "bab".match(/\k(?b)\w\k/)); +assert.compareArray(["bab", "b", "a"], "bab".match(/(?b)\k(?a)\k/)); // Reference properties. assert.sameValue("a", /(?a)(?b)\k/.exec("aba").groups.a); diff --git a/test/built-ins/RegExp/named-groups/unicode-match.js b/test/built-ins/RegExp/named-groups/unicode-match.js index a8e1059bdb..38edd555b2 100644 --- a/test/built-ins/RegExp/named-groups/unicode-match.js +++ b/test/built-ins/RegExp/named-groups/unicode-match.js @@ -8,41 +8,39 @@ features: [regexp-named-groups] includes: [compareArray.js] ---*/ -assert(compareArray(["a", "a"], "bab".match(/(?a)/u))); -assert(compareArray(["a", "a"], "bab".match(/(?a)/u))); -assert(compareArray(["a", "a"], "bab".match(/(?<_>a)/u))); -assert(compareArray(["a", "a"], "bab".match(/(?<$>a)/u))); -assert(compareArray(["bab", "a"], "bab".match(/.(?<$>a)./u))); -assert(compareArray(["bab", "a", "b"], "bab".match(/.(?a)(.)/u))); -assert(compareArray(["bab", "a", "b"], "bab".match(/.(?a)(?.)/u))); -assert(compareArray(["bab", "ab"], "bab".match(/.(?\w\w)/u))); -assert(compareArray(["bab", "bab"], "bab".match(/(?\w\w\w)/u))); -assert(compareArray(["bab", "ba", "b"], "bab".match(/(?\w\w)(?\w)/u))); +assert.compareArray(["a", "a"], "bab".match(/(?a)/u)); +assert.compareArray(["a", "a"], "bab".match(/(?a)/u)); +assert.compareArray(["a", "a"], "bab".match(/(?<_>a)/u)); +assert.compareArray(["a", "a"], "bab".match(/(?<$>a)/u)); +assert.compareArray(["bab", "a"], "bab".match(/.(?<$>a)./u)); +assert.compareArray(["bab", "a", "b"], "bab".match(/.(?a)(.)/u)); +assert.compareArray(["bab", "a", "b"], "bab".match(/.(?a)(?.)/u)); +assert.compareArray(["bab", "ab"], "bab".match(/.(?\w\w)/u)); +assert.compareArray(["bab", "bab"], "bab".match(/(?\w\w\w)/u)); +assert.compareArray(["bab", "ba", "b"], "bab".match(/(?\w\w)(?\w)/u)); let {a, b, c} = /(?.)(?.)(?.)\k\k\k/u.exec("abccba").groups; assert.sameValue(a, "a"); assert.sameValue(b, "b"); assert.sameValue(c, "c"); -assert(compareArray("bab".match(/(a)/u), "bab".match(/(?a)/u))); -assert(compareArray("bab".match(/(a)/u), "bab".match(/(?a)/u))); -assert(compareArray("bab".match(/(a)/u), "bab".match(/(?<_>a)/u))); -assert(compareArray("bab".match(/(a)/u), "bab".match(/(?<$>a)/u))); -assert(compareArray("bab".match(/.(a)./u), "bab".match(/.(?<$>a)./u))); -assert(compareArray("bab".match(/.(a)(.)/u), "bab".match(/.(?a)(.)/u))); -assert(compareArray("bab".match(/.(a)(.)/u), "bab".match(/.(?a)(?.)/u))); -assert(compareArray("bab".match(/.(\w\w)/u), "bab".match(/.(?\w\w)/u))); -assert(compareArray("bab".match(/(\w\w\w)/u), "bab".match(/(?\w\w\w)/u))); -assert(compareArray("bab".match(/(\w\w)(\w)/u), "bab".match(/(?\w\w)(?\w)/u))); +assert.compareArray("bab".match(/(a)/u), "bab".match(/(?a)/u)); +assert.compareArray("bab".match(/(a)/u), "bab".match(/(?a)/u)); +assert.compareArray("bab".match(/(a)/u), "bab".match(/(?<_>a)/u)); +assert.compareArray("bab".match(/(a)/u), "bab".match(/(?<$>a)/u)); +assert.compareArray("bab".match(/.(a)./u), "bab".match(/.(?<$>a)./u)); +assert.compareArray("bab".match(/.(a)(.)/u), "bab".match(/.(?a)(.)/u)); +assert.compareArray("bab".match(/.(a)(.)/u), "bab".match(/.(?a)(?.)/u)); +assert.compareArray("bab".match(/.(\w\w)/u), "bab".match(/.(?\w\w)/u)); +assert.compareArray("bab".match(/(\w\w\w)/u), "bab".match(/(?\w\w\w)/u)); +assert.compareArray("bab".match(/(\w\w)(\w)/u), "bab".match(/(?\w\w)(?\w)/u)); -assert(compareArray(["bab", "b"], "bab".match(/(?b).\1/u))); -assert(compareArray(["baba", "b", "a"], "baba".match(/(.)(?a)\1\2/u))); -assert(compareArray(["baba", "b", "a", "b", "a"], - "baba".match(/(.)(?a)(?\1)(\2)/u))); -assert(compareArray(["<)a/u))); -assert(compareArray([">a", ">"], ">a".match(/(?>)a/u))); +assert.compareArray(["bab", "b"], "bab".match(/(?b).\1/u)); +assert.compareArray(["baba", "b", "a"], "baba".match(/(.)(?a)\1\2/u)); +assert.compareArray(["baba", "b", "a", "b", "a"], "baba".match(/(.)(?a)(?\1)(\2)/u)); +assert.compareArray(["<)a/u)); +assert.compareArray([">a", ">"], ">a".match(/(?>)a/u)); // Nested groups. -assert(compareArray(["bab", "bab", "ab", "b"], "bab".match(/(?.(?.(?.)))/u))); -assert(compareArray({a: "bab", b: "ab", c: "b"}, - "bab".match(/(?.(?.(?.)))/u).groups)); +assert.compareArray(["bab", "bab", "ab", "b"], "bab".match(/(?.(?.(?.)))/u)); +assert.compareArray({a: "bab", b: "ab", c: "b"}, "bab".match(/(?.(?.(?.)))/u).groups); diff --git a/test/built-ins/RegExp/named-groups/unicode-references.js b/test/built-ins/RegExp/named-groups/unicode-references.js index 1f95a2f40c..ab74b9c88b 100644 --- a/test/built-ins/RegExp/named-groups/unicode-references.js +++ b/test/built-ins/RegExp/named-groups/unicode-references.js @@ -22,23 +22,23 @@ includes: [compareArray.js] ---*/ // Named references. -assert(compareArray(["bab", "b"], "bab".match(/(?.).\k/u))); +assert.compareArray(["bab", "b"], "bab".match(/(?.).\k/u)); assert.sameValue(null, "baa".match(/(?.).\k/u)); // Reference inside group. -assert(compareArray(["bab", "b"], "bab".match(/(?\k\w)../u))); +assert.compareArray(["bab", "b"], "bab".match(/(?\k\w)../u)); assert.sameValue("b", "bab".match(/(?\k\w)../u).groups.a); // Reference before group. -assert(compareArray(["bab", "b"], "bab".match(/\k(?b)\w\k/u))); +assert.compareArray(["bab", "b"], "bab".match(/\k(?b)\w\k/u)); assert.sameValue("b", "bab".match(/\k(?b)\w\k/u).groups.a); -assert(compareArray(["bab", "b", "a"], "bab".match(/(?b)\k(?a)\k/u))); +assert.compareArray(["bab", "b", "a"], "bab".match(/(?b)\k(?a)\k/u)); let {a, b} = "bab".match(/(?b)\k(?a)\k/u).groups; assert.sameValue(a, "a"); assert.sameValue(b, "b"); -assert(compareArray(["bab", "b"], "bab".match(/\k(?b)\w\k/))); -assert(compareArray(["bab", "b", "a"], "bab".match(/(?b)\k(?a)\k/))); +assert.compareArray(["bab", "b"], "bab".match(/\k(?b)\w\k/)); +assert.compareArray(["bab", "b", "a"], "bab".match(/(?b)\k(?a)\k/)); // Reference properties. assert.sameValue("a", /(?a)(?b)\k/u.exec("aba").groups.a);