try

Author: youknowone

src/cmath/exponential.rs

@@ -4,7 +4,7 @@ use super::{
     CM_LARGE_DOUBLE, CM_LOG_LARGE_DOUBLE, INF, M_LN2, N, P, P12, P14, P34, U, c, special_type,
     special_value,
 };
-use crate::{Error, Result, m};
+use crate::{Error, Result, m, mul_add};
 use num_complex::Complex64;
 
 // Local constants
@@ -160,7 +160,8 @@ pub(crate) fn ln(z: Complex64) -> Result<Complex64> {
         if (0.71..=1.73).contains(&h) {
             let am = if ax > ay { ax } else { ay }; // max(ax, ay)
             let an = if ax > ay { ay } else { ax }; // min(ax, ay)
-            m::log1p((am - 1.0) * (am + 1.0) + an * an) / 2.0
+            let log1p_arg = mul_add(am - 1.0, am + 1.0, an * an);
+            m::log1p(log1p_arg) / 2.0
         } else {
             m::log(h)
         }

src/cmath/misc.rs

@@ -28,14 +28,41 @@ pub fn phase(z: Complex64) -> Result<f64> {
     }
 }
 
+#[inline]
+fn c_abs_raw(z: Complex64) -> f64 {
+    if !z.re.is_finite() || !z.im.is_finite() {
+        // C99 rules: if either part is infinite, return infinity,
+        // even if the other part is NaN.
+        if z.re.is_infinite() {
+            return m::fabs(z.re);
+        }
+        if z.im.is_infinite() {
+            return m::fabs(z.im);
+        }
+        return f64::NAN;
+    }
+    m::hypot(z.re, z.im)
+}
+
+#[inline]
+fn c_abs_checked(z: Complex64) -> Result<f64> {
+    if !z.re.is_finite() || !z.im.is_finite() {
+        return Ok(c_abs_raw(z));
+    }
+    crate::err::set_errno(0);
+    let r = m::hypot(z.re, z.im);
+    if r.is_infinite() {
+        Err(Error::ERANGE)
+    } else {
+        Ok(r)
+    }
+}
+
 /// Convert z to polar coordinates (r, phi).
 #[inline]
 pub fn polar(z: Complex64) -> Result<(f64, f64)> {
     let phi = m::atan2(z.im, z.re);
-    let r = m::hypot(z.re, z.im);
-    if r.is_infinite() && z.re.is_finite() && z.im.is_finite() {
-        return Err(Error::ERANGE);
-    }
+    let r = c_abs_checked(z)?;
     Ok((r, phi))
 }
 
@@ -94,7 +121,7 @@ pub fn isinf(z: Complex64) -> bool {
 /// Complex absolute value (magnitude).
 #[inline]
 pub fn abs(z: Complex64) -> f64 {
-    m::hypot(z.re, z.im)
+    c_abs_raw(z)
 }
 
 /// Determine whether two complex numbers are close in value.

src/math/integer.rs

@@ -715,7 +715,7 @@ mod tests {
     use pyo3::prelude::*;
 
     /// Edge i64 values for testing integer math functions (gcd, lcm, isqrt, factorial, comb, perm)
-    const EDGE_I64: [i64; 44] = [
+    const EDGE_I64: &[i64] = &[
         // Zero and small values
         0,
         1,
@@ -982,9 +982,9 @@ mod tests {
     #[test]
     fn edgetest_gcd() {
         // Test all edge values - gcd handles arbitrary large integers
-        for &a in &EDGE_I64 {
+        for &a in EDGE_I64 {
             test_gcd_impl(&[a]);
-            for &b in &EDGE_I64 {
+            for &b in EDGE_I64 {
                 test_gcd_impl(&[a, b]);
             }
         }
@@ -997,9 +997,9 @@ mod tests {
     #[test]
     fn edgetest_lcm() {
         // Test all edge values - lcm handles arbitrary large integers
-        for &a in &EDGE_I64 {
+        for &a in EDGE_I64 {
             test_lcm_impl(&[a]);
-            for &b in &EDGE_I64 {
+            for &b in EDGE_I64 {
                 test_lcm_impl(&[a, b]);
             }
         }
@@ -1011,7 +1011,7 @@ mod tests {
 
     #[test]
     fn edgetest_isqrt() {
-        for &n in &EDGE_I64 {
+        for &n in EDGE_I64 {
             test_isqrt_impl(n);
         }
         // Additional boundary cases
@@ -1031,7 +1031,7 @@ mod tests {
 
     #[test]
     fn edgetest_factorial() {
-        for &n in &EDGE_I64 {
+        for &n in EDGE_I64 {
             // factorial only makes sense for reasonable n values
             if n >= -10 && n <= 170 {
                 test_factorial_impl(n);