Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Preserve imaginary zero signs when adding real values to complex numbers (#7421)

Browse Source 
* Preserve imaginary zero signs when adding real values to complex numbers

* Refactor complex_add with match expression

* Correct complex real subtract op

* Remove unnecessary vm arugment
This commit is contained in:
Lee Dogeon
2026-03-15 17:04:23 +09:00
committed by GitHub
parent 9a297aad2b
commit 9ddd07a656
2 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_builtin.py vendored
View File

@@ -1971,7 +1971,6 @@ class BuiltinTest(ComplexesAreIdenticalMixin, unittest.TestCase):
# test_str(): see test_str.py and test_bytes.py for str() tests.
@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: floats 0.0 and -0.0 are not identical: zeros have different signs
def test_sum(self):
self.assertEqual(sum([]), 0)
self.assertEqual(sum(list(range(2,8))), 27)

60
crates/vm/src/builtins/complex.rs
View File

@@ -287,6 +287,44 @@ impl PyComplex {
Ok(vm.ctx.not_implemented())
}
}
fn complex_real_binop<CCF, RCF, CRF, R>(
a: &PyObject,
b: &PyObject,
cc_op: CCF,
cr_op: CRF,
rc_op: RCF,
vm: &VirtualMachine,
) -> PyResult
where
CCF: FnOnce(Complex64, Complex64) -> R,
CRF: FnOnce(Complex64, f64) -> R,
RCF: FnOnce(f64, Complex64) -> R,
R: ToPyResult,
{
let value = match (a.downcast_ref::<PyComplex>(), b.downcast_ref::<PyComplex>()) {
// complex + complex
(Some(a_complex), Some(b_complex)) => cc_op(a_complex.value, b_complex.value),
(Some(a_complex), None) => {
let Some(b_real) = float::to_op_float(b, vm)? else {
return Ok(vm.ctx.not_implemented());
};
// complex + real
cr_op(a_complex.value, b_real)
}
(None, Some(b_complex)) => {
let Some(a_real) = float::to_op_float(a, vm)? else {
return Ok(vm.ctx.not_implemented());
};
// real + complex
rc_op(a_real, b_complex.value)
}
(None, None) => return Ok(vm.ctx.not_implemented()),
};
value.to_pyresult(vm)
}
}
#[pyclass(
@@ -396,8 +434,26 @@ impl Hashable for PyComplex {
impl AsNumber for PyComplex {
fn as_number() -> &'static PyNumberMethods {
static AS_NUMBER: PyNumberMethods = PyNumberMethods {
add: Some(|a, b, vm| PyComplex::number_op(a, b, |a, b, _vm| a + b, vm)),
subtract: Some(|a, b, vm| PyComplex::number_op(a, b, |a, b, _vm| a - b, vm)),
add: Some(|a, b, vm| {
PyComplex::complex_real_binop(
a,
b,
|a, b| a + b,
|a_complex, b_real| Complex64::new(a_complex.re + b_real, a_complex.im),
|a_real, b_complex| Complex64::new(a_real + b_complex.re, b_complex.im),
vm,
)
}),
subtract: Some(|a, b, vm| {
PyComplex::complex_real_binop(
a,
b,
|a, b| a - b,
|a_complex, b_real| Complex64::new(a_complex.re - b_real, a_complex.im),
|a_real, b_complex| Complex64::new(a_real - b_complex.re, -b_complex.im),
vm,
)
}),
multiply: Some(|a, b, vm| PyComplex::number_op(a, b, |a, b, _vm| a * b, vm)),
power: Some(|a, b, c, vm| {
if vm.is_none(c) {