Replace puruspe to pymath

youknowone · youknowone · commit b0991e28a255 · 2025-04-29T17:39:50.000+09:00
Might be lower quality, but better compatibility
diff --git a/.cspell.dict/rust-more.txt b/.cspell.dict/rust-more.txt
@@ -51,7 +51,6 @@ powf
 powi
 prepended
 punct
-puruspe
 replacen
 rmatch
 rposition
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -184,6 +184,7 @@ once_cell = "1.20.3"
 parking_lot = "0.12.3"
 paste = "1.0.15"
 proc-macro2 = "1.0.93"
+pymath = "0.0.2"
 quote = "1.0.38"
 rand = "0.9"
 rand_core = { version = "0.9", features = ["os_rng"] }
diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py
@@ -1374,6 +1374,7 @@ def test_sumprod_accuracy(self):
         self.assertEqual(sumprod([True, False] * 10, [0.1] * 20), 1.0)
         self.assertEqual(sumprod([1.0, 10E100, 1.0, -10E100], [1.0]*4), 2.0)
 
+    @unittest.skip("TODO: RUSTPYTHON, Taking a few minutes.")
     @support.requires_resource('cpu')
     def test_sumprod_stress(self):
         sumprod = math.sumprod
@@ -2079,7 +2080,7 @@ def test_testfile(self):
             self.fail('Failures in test_testfile:\n  ' +
                       '\n  '.join(failures))
 
-    @unittest.skip("TODO: RUSTPYTHON, Currently hangs. Function never finishes.")
+    @unittest.skip("TODO: RUSTPYTHON, Taking a few minutes.")
     @requires_IEEE_754
     def test_mtestfile(self):
         fail_fmt = "{}: {}({!r}): {}"
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -45,7 +45,7 @@ memchr = { workspace = true }
 base64 = "0.22"
 csv-core = "0.1.11"
 dyn-clone = "1.0.10"
-puruspe = "0.4.0"
+pymath = { workspace = true }
 xml-rs = "0.8.14"
 
 # random
diff --git a/stdlib/src/math.rs b/stdlib/src/math.rs
@@ -1,5 +1,7 @@
 pub(crate) use math::make_module;
 
+use crate::{builtins::PyBaseExceptionRef, vm::VirtualMachine};
+
 #[pymodule]
 mod math {
     use crate::vm::{
@@ -17,6 +19,8 @@ mod math {
     // Constants
     #[pyattr]
     use std::f64::consts::{E as e, PI as pi, TAU as tau};
+
+    use super::pymath_error_to_exception;
     #[pyattr(name = "inf")]
     const INF: f64 = f64::INFINITY;
     #[pyattr(name = "nan")]
@@ -475,38 +479,22 @@ mod math {
     // Special functions:
     #[pyfunction]
     fn erf(x: ArgIntoFloat) -> f64 {
-        let x = *x;
-        if x.is_nan() { x } else { puruspe::erf(x) }
+        pymath::erf(*x)
     }
 
     #[pyfunction]
     fn erfc(x: ArgIntoFloat) -> f64 {
-        let x = *x;
-        if x.is_nan() { x } else { puruspe::erfc(x) }
+        pymath::erfc(*x)
     }
 
     #[pyfunction]
-    fn gamma(x: ArgIntoFloat) -> f64 {
-        let x = *x;
-        if x.is_finite() {
-            puruspe::gamma(x)
-        } else if x.is_nan() || x.is_sign_positive() {
-            x
-        } else {
-            f64::NAN
-        }
+    fn gamma(x: ArgIntoFloat, vm: &VirtualMachine) -> PyResult<f64> {
+        pymath::gamma(*x).map_err(|err| pymath_error_to_exception(err, vm))
     }
 
     #[pyfunction]
-    fn lgamma(x: ArgIntoFloat) -> f64 {
-        let x = *x;
-        if x.is_finite() {
-            puruspe::ln_gamma(x)
-        } else if x.is_nan() {
-            x
-        } else {
-            f64::INFINITY
-        }
+    fn lgamma(x: ArgIntoFloat, vm: &VirtualMachine) -> PyResult<f64> {
+        pymath::lgamma(*x).map_err(|err| pymath_error_to_exception(err, vm))
     }
 
     fn try_magic_method(
@@ -1000,3 +988,10 @@ mod math {
         Ok(result)
     }
 }
+
+fn pymath_error_to_exception(err: pymath::Error, vm: &VirtualMachine) -> PyBaseExceptionRef {
+    match err {
+        pymath::Error::EDOM => vm.new_value_error("math domain error".to_owned()),
+        pymath::Error::ERANGE => vm.new_overflow_error("math range error".to_owned()),
+    }
+}
