fix(stdlib): Optimize number modulo (#2144)

grain-lang · Aug 16, 2024 · 960fadd · 960fadd
1 parent c8624c3
commit 960fadd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/compiler/test/runtime/numbers.test.gr b/compiler/test/runtime/numbers.test.gr
@@ -89,7 +89,7 @@ assert isNaN(NaN % Infinity)
 assert isNaN(NaN % -Infinity)
 assert -17 % 4 == 3
 assert -17 % -4 == -1
-assert 17 % -4 == 5
+assert 17 % -4 == -3
 assert -17 % 17 == 0
 assert 17 % -17 == 0
 assert 17 % 17 == 0
diff --git a/stdlib/runtime/numbers.gr b/stdlib/runtime/numbers.gr
@@ -1613,7 +1613,7 @@ let i64abs = x => {
 
 @unsafe
 let numberMod = (x, y) => {
-  use WasmI64.{ (!=), (-), (*), (<), (>) }
+  use WasmI64.{ (!=), (-), (*), (<), (>), (^) }
   // incRef x and y to reuse them via WasmI32.toGrain
   Memory.incRef(x)
   Memory.incRef(y)
@@ -1636,14 +1636,14 @@ let numberMod = (x, y) => {
       throw Exception.ModuloByZero
     }
     // We implement true modulo
-    if (xval < 0N && yval > 0N || xval > 0N && yval < 0N) {
-      let modval = WasmI64.remS(i64abs(xval), i64abs(yval))
-      let result = if (modval != 0N) {
-        i64abs(yval) - modval * (if (yval < 0N) -1N else 1N)
-      } else {
-        modval
-      }
-      reducedInteger(result)
+    if ((xval ^ yval) < 0N) {
+      let xabs = i64abs(xval)
+      let yabs = i64abs(yval)
+      let mval = WasmI64.remS(xabs, yabs)
+      let mres = yabs - mval
+      reducedInteger(
+        if (mval != 0N) (if (yval < 0N) 0N - mres else mres) else 0N
+      )
     } else {
       reducedInteger(WasmI64.remS(xval, yval))
     }