Skip to content
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.

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

gh-127937: convert decimal module to use import/export API for ints (PEP 757) #127925

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
42 changes: 27 additions & 15 deletions Modules/_decimal/_decimal.c
Original file line number Diff line number Diff line change
Expand Up @@ -3639,12 +3639,13 @@ dec_format(PyObject *dec, PyObject *args)
static PyObject *
dec_as_long(PyObject *dec, PyObject *context, int round)
{
PyLongObject *pylong;
PyObject *pylong;
digit *ob_digit;
size_t n;
mpd_t *x;
mpd_context_t workctx;
uint32_t status = 0;
const PyLongLayout *layout = PyLong_GetNativeLayout();

if (mpd_isspecial(MPD(dec))) {
if (mpd_isnan(MPD(dec))) {
Expand Down Expand Up @@ -3672,34 +3673,45 @@ dec_as_long(PyObject *dec, PyObject *context, int round)
}

status = 0;
ob_digit = NULL;

int64_t val = mpd_qget_i64(x, &status);
if (!status) {
mpd_del(x);
return PyLong_FromInt64(val);
}

n = (mpd_sizeinbase(x, 2) +
layout->bits_per_digit - 1) / layout->bits_per_digit;
skirpichev marked this conversation as resolved.
Show resolved Hide resolved
PyLongWriter *writer = PyLongWriter_Create(mpd_isnegative(x), n,
(void**)&ob_digit);
/* mpd_sizeinbase can overestimate size by 1 digit, set it to zero. */
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, this looks as a bug in the mpdecimal. C.f. the GNU GMP, the mpz_sizeinbase docs says: "If base is a power of 2, the result is always exact".

ob_digit[n-1] = 0;
if (writer == NULL) {
PyLongWriter_Discard(writer);
skirpichev marked this conversation as resolved.
Show resolved Hide resolved
mpd_del(x);
return NULL;
}

status = 0;
#if PYLONG_BITS_IN_DIGIT == 30
skirpichev marked this conversation as resolved.
Show resolved Hide resolved
n = mpd_qexport_u32(&ob_digit, 0, PyLong_BASE, x, &status);
n = mpd_qexport_u32(&ob_digit, n, PyLong_BASE, x, &status);
#elif PYLONG_BITS_IN_DIGIT == 15
n = mpd_qexport_u16(&ob_digit, 0, PyLong_BASE, x, &status);
n = mpd_qexport_u16(&ob_digit, n, PyLong_BASE, x, &status);
#else
#error "PYLONG_BITS_IN_DIGIT should be 15 or 30"
#endif

if (n == SIZE_MAX) {
PyErr_NoMemory();
PyLongWriter_Discard(writer);
mpd_del(x);
return NULL;
}

if (n == 1) {
sdigit val = mpd_arith_sign(x) * ob_digit[0];
mpd_free(ob_digit);
mpd_del(x);
return PyLong_FromLong(val);
}

assert(n > 0);
skirpichev marked this conversation as resolved.
Show resolved Hide resolved
assert(!mpd_iszero(x));
pylong = _PyLong_FromDigits(mpd_isnegative(x), n, ob_digit);
mpd_free(ob_digit);
pylong = PyLongWriter_Finish(writer);
mpd_del(x);
return (PyObject *) pylong;
return pylong;
skirpichev marked this conversation as resolved.
Show resolved Hide resolved
}

/* Convert a Decimal to its exact integer ratio representation. */
Expand Down
Loading