Skip to content

Commit 0d2f278

Browse files
committedJan 14, 2023
simplify iteration in Set#{ isDisjointFrom, isSupersetOf }
1 parent b4d713b commit 0d2f278

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed
 

‎packages/core-js/internals/set-is-disjoint-from.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ var has = require('../internals/set-helpers').has;
44
var size = require('../internals/set-size');
55
var getSetRecord = require('../internals/get-set-record');
66
var iterateSet = require('../internals/set-iterate');
7-
var iterate = require('../internals/iterate');
7+
var iterateSimple = require('../internals/iterate-simple');
8+
var iteratorClose = require('../internals/iterator-close');
89

910
// `Set.prototype.isDisjointFrom` method
1011
// https://tc39.github.io/proposal-set-methods/#Set.prototype.isDisjointFrom
1112
module.exports = function isDisjointFrom(other) {
1213
var O = aSet(this);
1314
var otherRec = getSetRecord(other);
14-
return false !== (size(O) <= otherRec.size
15-
? iterateSet(O, function (e) {
16-
if (otherRec.includes(e)) return false;
17-
}, true)
18-
: !iterate(otherRec.getIterator(), function (e, stop) {
19-
if (has(O, e)) return stop();
20-
}, { IS_ITERATOR: true, INTERRUPTED: true }).stopped
21-
);
15+
if (size(O) <= otherRec.size) return iterateSet(O, function (e) {
16+
if (otherRec.includes(e)) return false;
17+
}, true) !== false;
18+
var iterator = otherRec.getIterator();
19+
return iterateSimple(iterator, function (e) {
20+
if (has(O, e)) return iteratorClose(iterator, 'normal', false);
21+
}) !== false;
2222
};

‎packages/core-js/internals/set-is-superset-of.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ var aSet = require('../internals/a-set');
33
var has = require('../internals/set-helpers').has;
44
var size = require('../internals/set-size');
55
var getSetRecord = require('../internals/get-set-record');
6-
var iterate = require('../internals/iterate');
6+
var iterateSimple = require('../internals/iterate-simple');
7+
var iteratorClose = require('../internals/iterator-close');
78

89
// `Set.prototype.isSupersetOf` method
910
// https://tc39.github.io/proposal-set-methods/#Set.prototype.isSupersetOf
1011
module.exports = function isSupersetOf(other) {
1112
var O = aSet(this);
1213
var otherRec = getSetRecord(other);
1314
if (size(O) < otherRec.size) return false;
14-
return !iterate(otherRec.getIterator(), function (e, stop) {
15-
if (!has(O, e)) return stop();
16-
}, { IS_ITERATOR: true, INTERRUPTED: true }).stopped;
15+
var iterator = otherRec.getIterator();
16+
return iterateSimple(iterator, function (e) {
17+
if (!has(O, e)) return iteratorClose(iterator, 'normal', false);
18+
}) !== false;
1719
};

0 commit comments

Comments
 (0)
Please sign in to comment.