diff --git a/src/disjoint.js b/src/disjoint.js index d62a670..ddb914a 100644 --- a/src/disjoint.js +++ b/src/disjoint.js @@ -7,8 +7,8 @@ export default function disjoint(values, other) { let value, done; while (({value, done} = iterator.next())) { if (done) break; - if (Object.is(v, value)) return false; set.add(value); + if (set.has(v)) return false; } } return true; diff --git a/src/superset.js b/src/superset.js index d178e9c..2d31550 100644 --- a/src/superset.js +++ b/src/superset.js @@ -8,7 +8,7 @@ export default function superset(values, other) { if (done) return false; const ivalue = intern(value); set.add(ivalue); - if (Object.is(io, ivalue)) break; + if (set.has(io)) break; } } return true; diff --git a/test/disjoint-test.js b/test/disjoint-test.js index 30e691a..c21dc96 100644 --- a/test/disjoint-test.js +++ b/test/disjoint-test.js @@ -33,3 +33,19 @@ function* repeat(...values) { yield* values; } } + +it("disjoint(values, other) interns values encountered while advancing the iterator", () => { + assert.strictEqual(disjoint([new Date(0)], [new Date(0)]), false); + for (const values of [[new Date(0)], [Object(1)], [Object("a")]]) { + const other = values.map(value => Object(value.valueOf())); + assert.strictEqual(disjoint(values, other), false); + assert.strictEqual(disjoint(values, [null, ...other]), false); + assert.strictEqual(disjoint(other, values), false); + } +}); + +it("disjoint(values, other) uses set equality for signed zeros and NaN", () => { + assert.strictEqual(disjoint([-0], [0]), false); + assert.strictEqual(disjoint([0], [-0]), false); + assert.strictEqual(disjoint([NaN], [NaN]), false); +}); diff --git a/test/subset-test.js b/test/subset-test.js index 00dd3fd..5d75946 100644 --- a/test/subset-test.js +++ b/test/subset-test.js @@ -13,3 +13,12 @@ it("subset(values, other) performs interning", () => { assert.strictEqual(subset([new Date("2021-01-03"), new Date("2021-01-04")], [new Date("2021-01-02"), new Date("2021-01-03")]), false); assert.strictEqual(subset([], [new Date("2021-01-01")]), true); }); + +it("subset(values, other) uses set equality for signed zeros and NaN", () => { + assert.strictEqual(subset([-0], [0]), true); + assert.strictEqual(subset([0], [-0]), true); + assert.strictEqual(subset([Object(-0)], [0]), true); + assert.strictEqual(subset([0], [Object(-0)]), true); + assert.strictEqual(subset([0, 1], [1, -0]), true); + assert.strictEqual(subset([NaN], [NaN]), true); +}); diff --git a/test/superset-test.js b/test/superset-test.js index 3b6221b..6372e8c 100644 --- a/test/superset-test.js +++ b/test/superset-test.js @@ -22,6 +22,15 @@ it("superset(values, other) performs interning", () => { assert.strictEqual(superset([new Date("2021-01-01")], []), true); }); +it("superset(values, other) uses set equality for signed zeros and NaN", () => { + assert.strictEqual(superset([-0], [0]), true); + assert.strictEqual(superset([0], [-0]), true); + assert.strictEqual(superset([Object(-0)], [0]), true); + assert.strictEqual(superset([0], [Object(-0)]), true); + assert.strictEqual(superset([1, -0], [0, 1]), true); + assert.strictEqual(superset([NaN], [NaN]), true); +}); + function* odds() { for (let i = 1; true; i += 2) { yield i;