wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1075059 - Part 2: Backout of Array.prototpype.contains. r=jorendorff

Browse Source 
--HG--
extra : rebase_source : 088d2cc999b55eb2c6c0d43b47bc5f3cc6d9d69a
This commit is contained in:
Till Schneidereit 2014-10-02 17:38:46 +02:00
parent ef79207c09
commit 01d4d54388
10 changed files with 1 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
js/src/builtin/Array.js
View File

@ -581,54 +581,6 @@ function ArrayFill(value, start = 0, end = undefined) {
return O;
}
// Proposed for ES7:
// https://github.com/domenic/Array.prototype.contains/blob/master/spec.md
function ArrayContains(searchElement, fromIndex = 0) {
// Steps 1-2.
var O = ToObject(this);
// Steps 3-4.
var len = ToLength(O.length);
// Step 5.
if (len === 0)
return false;
// Steps 6-7.
var n = ToInteger(fromIndex);
// Step 8.
if (n >= len)
return false;
// Step 9.
var k;
if (n >= 0) {
k = n;
}
// Step 10.
else {
// Step a.
k = len + n;
// Step b.
if (k < 0)
k = 0;
}
// Step 11.
while (k < len) {
// Steps a-c.
if (SameValueZero(searchElement, O[k]))
return true;
// Step d.
k++;
}
// Step 12.
return false;
}
#define ARRAY_ITERATOR_SLOT_ITERATED_OBJECT 0
#define ARRAY_ITERATOR_SLOT_NEXT_INDEX 1
#define ARRAY_ITERATOR_SLOT_ITEM_KIND 2

7
js/src/builtin/Utilities.js
View File

@ -92,7 +92,7 @@ function CheckObjectCoercible(v) {
ThrowError(JSMSG_CANT_CONVERT_TO, ToString(v), "object");
}
// Spec: ECMAScript Draft, 6th edition May 22, 2014, 7.1.15.
/* Spec: ECMAScript Draft, 6 edition May 22, 2014, 7.1.15 */
function ToLength(v) {
v = ToInteger(v);
@ -103,11 +103,6 @@ function ToLength(v) {
return v < 0x1fffffffffffff ? v : 0x1fffffffffffff;
}
// Spec: ECMAScript Draft, 6th edition Aug 24, 2014, 7.2.4.
function SameValueZero(x, y) {
return x === y || (x !== x && y !== y);
}
/********** Testing code **********/
#ifdef ENABLE_PARALLEL_JS

6
js/src/jsarray.cpp
View File

@ -3023,12 +3023,6 @@ static const JSFunctionSpec array_methods[] = {
JS_SELF_HOSTED_FN("@@iterator", "ArrayValues", 0,0),
JS_SELF_HOSTED_FN("entries", "ArrayEntries", 0,0),
JS_SELF_HOSTED_FN("keys", "ArrayKeys", 0,0),
/* ES7 additions */
#ifdef NIGHTLY_BUILD
JS_SELF_HOSTED_FN("contains", "ArrayContains", 2,0),
#endif
JS_FS_END
};

1
js/src/tests/Makefile.in
View File

@ -18,7 +18,6 @@ TEST_FILES = \
ecma_3_1/ \
ecma_5/ \
ecma_6/ \
ecma_7/ \
Intl/ \
js1_1/ \
js1_2/ \

0
js/src/tests/ecma_7/Array/browser.js
View File

61
js/src/tests/ecma_7/Array/contains.js
View File

@ -1,61 +0,0 @@
/*
* Any copyright is dedicated to the Public Domain.
* https://creativecommons.org/publicdomain/zero/1.0/
*/
var BUGNUMBER = 1069063;
var summary = "Implement Array.prototype.contains";
print(BUGNUMBER + ": " + summary);
if ('contains' in Array.prototype) {
assertEq(typeof [].contains, "function");
assertEq([].contains.length, 1);
assertTrue([1, 2, 3].contains(2));
assertTrue([1,,2].contains(2));
assertTrue([1, 2, 3].contains(2, 1));
assertTrue([1, 2, 3].contains(2, -2));
assertTrue([1, 2, 3].contains(2, -100));
assertTrue([Object, Function, Array].contains(Function));
assertTrue([-0].contains(0));
assertTrue([NaN].contains(NaN));
assertTrue([,].contains());
assertTrue(staticContains("123", "2"));
assertTrue(staticContains({length: 3, 1: 2}, 2));
assertTrue(staticContains({length: 3, 1: 2, get 3(){throw ""}}, 2));
assertTrue(staticContains({length: 3, get 1() {return 2}}, 2));
assertTrue(staticContains({__proto__: {1: 2}, length: 3}, 2));
assertTrue(staticContains(new Proxy([1], {get(){return 2}}), 2));
assertFalse([1, 2, 3].contains("2"));
assertFalse([1, 2, 3].contains(2, 2));
assertFalse([1, 2, 3].contains(2, -1));
assertFalse([undefined].contains(NaN));
assertFalse([{}].contains({}));
assertFalse(staticContains({length: 3, 1: 2}, 2, 2));
assertFalse(staticContains({length: 3, get 0(){delete this[1]}, 1: 2}, 2));
assertFalse(staticContains({length: -100, 0: 1}, 1));
assertThrowsInstanceOf(() => staticContains(), TypeError);
assertThrowsInstanceOf(() => staticContains(null), TypeError);
assertThrowsInstanceOf(() => staticContains({get length(){throw TypeError()}}), TypeError);
assertThrowsInstanceOf(() => staticContains({length: 3, get 1() {throw TypeError()}}, 2), TypeError);
assertThrowsInstanceOf(() => staticContains({__proto__: {get 1() {throw TypeError()}}, length: 3}, 2), TypeError);
assertThrowsInstanceOf(() => staticContains(new Proxy([1], {get(){throw TypeError()}})), TypeError);
}
function assertTrue(v){
assertEq(v, true)
}
function assertFalse(v){
assertEq(v, false)
}
function staticContains(o, v, f){
return [].contains.call(o, v, f)
}
if (typeof reportCompare === "function")
reportCompare(true, true);

0
js/src/tests/ecma_7/Array/shell.js
View File

0
js/src/tests/ecma_7/browser.js
View File

197
js/src/tests/ecma_7/shell.js
View File

@ -1,197 +0,0 @@
/* 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/. */
if (typeof assertThrowsInstanceOf === 'undefined') {
var assertThrowsInstanceOf = function assertThrowsInstanceOf(f, ctor, msg) {
var fullmsg;
try {
f();
} catch (exc) {
if (exc instanceof ctor)
return;
fullmsg = "Assertion failed: expected exception " + ctor.name + ", got " + exc;
}
if (fullmsg === undefined)
fullmsg = "Assertion failed: expected exception " + ctor.name + ", no exception thrown";
if (msg !== undefined)
fullmsg += " - " + msg;
throw new Error(fullmsg);
};
}
if (typeof assertThrowsValue === 'undefined') {
var assertThrowsValue = function assertThrowsValue(f, val, msg) {
var fullmsg;
try {
f();
} catch (exc) {
if ((exc === val) === (val === val) && (val !== 0 || 1 / exc === 1 / val))
return;
fullmsg = "Assertion failed: expected exception " + val + ", got " + exc;
}
if (fullmsg === undefined)
fullmsg = "Assertion failed: expected exception " + val + ", no exception thrown";
if (msg !== undefined)
fullmsg += " - " + msg;
throw new Error(fullmsg);
};
}
if (typeof assertDeepEq === 'undefined') {
var assertDeepEq = (function(){
var call = Function.prototype.call,
Map_ = Map,
Error_ = Error,
Map_has = call.bind(Map.prototype.has),
Map_get = call.bind(Map.prototype.get),
Map_set = call.bind(Map.prototype.set),
Object_toString = call.bind(Object.prototype.toString),
Function_toString = call.bind(Function.prototype.toString),
Object_getPrototypeOf = Object.getPrototypeOf,
Object_hasOwnProperty = call.bind(Object.prototype.hasOwnProperty),
Object_getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor,
Object_isExtensible = Object.isExtensible,
Object_getOwnPropertyNames = Object.getOwnPropertyNames,
uneval_ = uneval;
// Return true iff ES6 Type(v) isn't Object.
// Note that `typeof document.all === "undefined"`.
function isPrimitive(v) {
return (v === null ||
v === undefined ||
typeof v === "boolean" ||
typeof v === "number" ||
typeof v === "string" ||
typeof v === "symbol");
}
function assertSameValue(a, b, msg) {
try {
assertEq(a, b);
} catch (exc) {
throw Error_(exc.message + (msg ? " " + msg : ""));
}
}
function assertSameClass(a, b, msg) {
var ac = Object_toString(a), bc = Object_toString(b);
assertSameValue(ac, bc, msg);
switch (ac) {
case "[object Function]":
assertSameValue(Function_toString(a), Function_toString(b), msg);
}
}
function at(prevmsg, segment) {
return prevmsg ? prevmsg + segment : "at _" + segment;
}
// Assert that the arguments a and b are thoroughly structurally equivalent.
//
// For the sake of speed, we cut a corner:
// var x = {}, y = {}, ax = [x];
// assertDeepEq([ax, x], [ax, y]); // passes (?!)
//
// Technically this should fail, since the two object graphs are different.
// (The graph of [ax, y] contains one more object than the graph of [ax, x].)
//
// To get technically correct behavior, pass {strictEquivalence: true}.
// This is slower because we have to walk the entire graph, and Object.prototype
// is big.
//
return function assertDeepEq(a, b, options) {
var strictEquivalence = options ? options.strictEquivalence : false;
function assertSameProto(a, b, msg) {
check(Object_getPrototypeOf(a), Object_getPrototypeOf(b), at(msg, ".__proto__"));
}
function failPropList(na, nb, msg) {
throw Error_("got own properties " + uneval_(na) + ", expected " + uneval_(nb) +
(msg ? " " + msg : ""));
}
function assertSameProps(a, b, msg) {
var na = Object_getOwnPropertyNames(a),
nb = Object_getOwnPropertyNames(b);
if (na.length !== nb.length)
failPropList(na, nb, msg);
for (var i = 0; i < na.length; i++) {
var name = na[i];
if (name !== nb[i])
failPropList(na, nb, msg);
var da = Object_getOwnPropertyDescriptor(a, name),
db = Object_getOwnPropertyDescriptor(b, name);
var pmsg = at(msg, /^[_$A-Za-z0-9]+$/.test(name)
? /0|[1-9][0-9]*/.test(name) ? "[" + name + "]" : "." + name
: "[" + uneval_(name) + "]");
assertSameValue(da.configurable, db.configurable, at(pmsg, ".[[Configurable]]"));
assertSameValue(da.enumerable, db.enumerable, at(pmsg, ".[[Enumerable]]"));
if (Object_hasOwnProperty(da, "value")) {
if (!Object_hasOwnProperty(db, "value"))
throw Error_("got data property, expected accessor property" + pmsg);
check(da.value, db.value, pmsg);
} else {
if (Object_hasOwnProperty(db, "value"))
throw Error_("got accessor property, expected data property" + pmsg);
check(da.get, db.get, at(pmsg, ".[[Get]]"));
check(da.set, db.set, at(pmsg, ".[[Set]]"));
}
}
};
var ab = Map_();
var bpath = Map_();
function check(a, b, path) {
if (typeof a === "symbol") {
// Symbols are primitives, but they have identity.
// Symbol("x") !== Symbol("x") but
// assertDeepEq(Symbol("x"), Symbol("x")) should pass.
if (typeof b !== "symbol") {
throw Error_("got " + uneval_(a) + ", expected " + uneval_(b) + " " + path);
} else if (uneval_(a) !== uneval_(b)) {
// We lamely use uneval_ to distinguish well-known symbols
// from user-created symbols. The standard doesn't offer
// a convenient way to do it.
throw Error_("got " + uneval_(a) + ", expected " + uneval_(b) + " " + path);
} else if (Map_has(ab, a)) {
assertSameValue(Map_get(ab, a), b, path);
} else if (Map_has(bpath, b)) {
var bPrevPath = Map_get(bpath, b) || "_";
throw Error_("got distinct symbols " + at(path, "") + " and " +
at(bPrevPath, "") + ", expected the same symbol both places");
} else {
Map_set(ab, a, b);
Map_set(bpath, b, path);
}
} else if (isPrimitive(a)) {
assertSameValue(a, b, path);
} else if (isPrimitive(b)) {
throw Error_("got " + Object_toString(a) + ", expected " + uneval_(b) + " " + path);
} else if (Map_has(ab, a)) {
assertSameValue(Map_get(ab, a), b, path);
} else if (Map_has(bpath, b)) {
var bPrevPath = Map_get(bpath, b) || "_";
throw Error_("got distinct objects " + at(path, "") + " and " + at(bPrevPath, "") +
", expected the same object both places");
} else {
Map_set(ab, a, b);
Map_set(bpath, b, path);
if (a !== b || strictEquivalence) {
assertSameClass(a, b, path);
assertSameProto(a, b, path);
assertSameProps(a, b, path);
assertSameValue(Object_isExtensible(a),
Object_isExtensible(b),
at(path, ".[[Extensible]]"));
}
}
}
check(a, b, "");
};
})();
}

1
js/xpconnect/tests/chrome/test_xrayToJS.xul
View File

@ -176,7 +176,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=933681
"forEach", "map", "reduce", "reduceRight", "filter", "some", "every", "find",
"findIndex", "copyWithin", "fill", "@@iterator", "entries", "keys", "constructor"];
if (isNightlyBuild) {
gPrototypeProperties['Array'].push('contains');
let pjsMethods = ['mapPar', 'reducePar', 'scanPar', 'scatterPar', 'filterPar'];
gPrototypeProperties['Array'] = gPrototypeProperties['Array'].concat(pjsMethods);
}