Make toIntN & toUintN more accommodating

These used to not handle non‐integers well, and now do gracefully.

diff --git a/numeric.js b/numeric.js
index 44c7cd5649772257f688cf5572236ce2452295e7..1d0a5435bb75512cd18b657759fdc6fccff85c89 100644 (file)
--- a/numeric.js
+++ b/numeric.js
@@ -605,15 +605,37 @@ export const {
   return {
     toIntN: (n, $) => {
       const prim = toPrimitive($);
   return {
     toIntN: (n, $) => {
       const prim = toPrimitive($);

-      const big·int = toBigInt(prim);
-      const intN = asIntN(n, big·int);
-      return typeof prim === "bigint" ? intN : toNumber(intN);
+      if (typeof prim === "bigint") {
+        // The primitive value is a big·int.
+        return asIntN(n, prim);
+      } else {
+        // The primitive value is not a big·int.
+        const int = trunc(prim);
+        if (!isFiniteNumber(int) || int == 0) {
+          // The truncated value is zero or not finite.
+          return 0;
+        } else {
+          // The truncated value is finite.
+          return toNumber(asIntN(n, toBigInt(int)));
+        }
+      }

     },
     toUintN: (n, $) => {
       const prim = toPrimitive($);
     },
     toUintN: (n, $) => {
       const prim = toPrimitive($);

-      const big·int = toBigInt(prim);
-      const uintN = asUintN(n, big·int);
-      return typeof prim === "bigint" ? uintN : toNumber(uintN);
+      if (typeof prim === "bigint") {
+        // The primitive value is a big·int.
+        return asUintN(n, prim);
+      } else {
+        // The primitive value is not a big·int.
+        const int = trunc(prim);
+        if (!isFiniteNumber(int) || int == 0) {
+          // The truncated value is zero or not finite.
+          return 0;
+        } else {
+          // The truncated value is finite.
+          return toNumber(asUintN(n, toBigInt(int)));
+        }
+      }

     },
   };
 })();
     },
   };
 })();

diff --git a/numeric.test.js b/numeric.test.js
index ea99bc97910346aa1ff67e96b57e8d66cadee5a7..96f51c1614e8cde3d1f7302d7e860ec1b278376d 100644 (file)
--- a/numeric.test.js
+++ b/numeric.test.js
@@ -150,6 +150,11 @@ describe("toIntN", () => {
   it("[[Call]] works with numbers", () => {
     assertStrictEquals(toIntN(2, 7), -1);
   });
   it("[[Call]] works with numbers", () => {
     assertStrictEquals(toIntN(2, 7), -1);
   });

+
+  it("[[Call]] works with non‐integers", () => {
+    assertStrictEquals(toIntN(2, 7.21), -1);
+    assertStrictEquals(toIntN(2, Infinity), 0);
+  });

 });
 
 describe("toIntegerOrInfinity", () => {
 });
 
 describe("toIntegerOrInfinity", () => {


@@ -212,4 +217,9 @@ describe("toUintN", () => {
   it("[[Call]] works with numbers", () => {
     assertStrictEquals(toUintN(2, 7), 3);
   });
   it("[[Call]] works with numbers", () => {
     assertStrictEquals(toUintN(2, 7), 3);
   });

+
+  it("[[Call]] works with non‐integers", () => {
+    assertStrictEquals(toUintN(2, 7.21), 3);
+    assertStrictEquals(toUintN(2, Infinity), 0);
+  });

 });
 });