Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moreal wants to merge 4 commits into
base: main
Choose a base branch
from
+58 −3
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4499323
Preserve imaginary zero signs when adding real values to complex numbers
moreal Mar 13, 2026
c3fba4b
Refactor complex_add with match expression
moreal Mar 14, 2026
df60617
Correct complex real subtract op
moreal Mar 14, 2026
2c45f61
Remove unnecessary vm arugment
moreal Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Lib/test/test_builtin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,6 @@ def test_setattr(self):

# 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)
Expand Down
60 changes: 58 additions & 2 deletions crates/vm/src/builtins/complex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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) {
Expand Down
Loading