simplify iteration in Set#{ isDisjointFrom, isSupersetOf }

zloirock · Jan 14, 2023 · 0d2f278 · 0d2f278
1 parent b4d713b
commit 0d2f278
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/packages/core-js/internals/set-is-disjoint-from.js b/packages/core-js/internals/set-is-disjoint-from.js
@@ -4,19 +4,19 @@ var has = require('../internals/set-helpers').has;
 var size = require('../internals/set-size');
 var getSetRecord = require('../internals/get-set-record');
 var iterateSet = require('../internals/set-iterate');
-var iterate = require('../internals/iterate');
+var iterateSimple = require('../internals/iterate-simple');
+var iteratorClose = require('../internals/iterator-close');
 
 // `Set.prototype.isDisjointFrom` method
 // https://tc39.github.io/proposal-set-methods/#Set.prototype.isDisjointFrom
 module.exports = function isDisjointFrom(other) {
   var O = aSet(this);
   var otherRec = getSetRecord(other);
-  return false !== (size(O) <= otherRec.size
-    ? iterateSet(O, function (e) {
-      if (otherRec.includes(e)) return false;
-    }, true)
-    : !iterate(otherRec.getIterator(), function (e, stop) {
-      if (has(O, e)) return stop();
-    }, { IS_ITERATOR: true, INTERRUPTED: true }).stopped
-  );
+  if (size(O) <= otherRec.size) return iterateSet(O, function (e) {
+    if (otherRec.includes(e)) return false;
+  }, true) !== false;
+  var iterator = otherRec.getIterator();
+  return iterateSimple(iterator, function (e) {
+    if (has(O, e)) return iteratorClose(iterator, 'normal', false);
+  }) !== false;
 };
diff --git a/packages/core-js/internals/set-is-superset-of.js b/packages/core-js/internals/set-is-superset-of.js
@@ -3,15 +3,17 @@ var aSet = require('../internals/a-set');
 var has = require('../internals/set-helpers').has;
 var size = require('../internals/set-size');
 var getSetRecord = require('../internals/get-set-record');
-var iterate = require('../internals/iterate');
+var iterateSimple = require('../internals/iterate-simple');
+var iteratorClose = require('../internals/iterator-close');
 
 // `Set.prototype.isSupersetOf` method
 // https://tc39.github.io/proposal-set-methods/#Set.prototype.isSupersetOf
 module.exports = function isSupersetOf(other) {
   var O = aSet(this);
   var otherRec = getSetRecord(other);
   if (size(O) < otherRec.size) return false;
-  return !iterate(otherRec.getIterator(), function (e, stop) {
-    if (!has(O, e)) return stop();
-  }, { IS_ITERATOR: true, INTERRUPTED: true }).stopped;
+  var iterator = otherRec.getIterator();
+  return iterateSimple(iterator, function (e) {
+    if (!has(O, e)) return iteratorClose(iterator, 'normal', false);
+  }) !== false;
 };