Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork33.7k
gh-102471, PEP 757: Add PyLong import and export API#121339
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
54 commits Select commitHold shift + click to select a range
f4fdbf2 gh-102471: Add PyLong import and export API
vstinnerc2e568e Add layout
vstinnerf0d9525 Merge branch 'main' into long_export
vstinnerb19764f Rename word_endian to digits_order
vstinner6f7fd11 Replace Py_digit* type with void*
vstinner080e079 Add PyLongWriter_Discard() function
vstinner1a7902f Fixes
vstinnerb70a6dd Use unsigned type for ndigits
vstinner07552a7 Remove again layout
vstinner0d0f942 Revert "Use unsigned type for ndigits"
vstinner762c33a doc: adjust ndigits documentation
vstinner20be7a3 Update doc
vstinnerd92bf1e Make PyLong_DigitArray.obj private
vstinnerb3b02a2 Remove reserved documentation
vstinnercaca2d7 PyLong_FreeDigitArray() only clears _reserved
vstinner4221a49 Make PyLong_LAYOUT static
vstinner37b1d49 Add PyLong_AsDigitArray.value
vstinnerd70a121 Inline PyLong_AsInt64() to avoid the exception
vstinner4aa25f6 Remove Py_digit type; update the doc
vstinner90973d4 Merge branch 'main' into long_export
vstinner5d3e224 Add long_asnativebytes() function
vstinnerc7d7cb2 Remove reference to removed Py_digit type
vstinnera3d601a Address Antoine's review
vstinnerc049268 Merge branch 'main' into long_export
vstinner06b196b Merge branch 'main' into long_export
skirpichev3e8d296 Apply suggestions from code review
skirpichev86c68c2 Merge branch 'main' into long_export
skirpicheva8fd669 Revert "Add long_asnativebytes() function"
vstinnera04f9d0 Use PyLong_AsLongAndOverflow()
vstinnerb2be94a Try PyLong_AsLongLongAndOverflow() first
vstinnerca98ad1 Merge branch 'main' into long_export
vstinner167d75e Update Doc/c-api/long.rst
vstinner5e53a5b Sync implementation with PEP (#8)
skirpichevc24789f Merge branch 'main' into long_export
skirpichev0422f9d fix NL in Doc/c-api/long.rst (sorry, damn web editor)
skirpicheva529a48 rename news
skirpichev3db44f3 Address Erlend's review
vstinner1d2863e Address Sergey's review
vstinnerd663511 Merge branch 'main' into long_export
vstinner816798d Merge branch 'main' into long_export
vstinner033bd65 Update documentation from PEP 757
vstinner36b87d4 Update Modules/_testcapi/long.c
vstinner94d852e Sync implementation with PEP (#9)
skirpicheva72ff83 Merge branch 'main' into long_export
vstinner53d584b Cleanup
vstinner577598a Update Doc/c-api/long.rst
vstinnerb08cd55 Address Steve's review
vstinnereaebef3 Address Bénédikt's review
vstinner03248c7 Apply suggestions from code review
vstinner0a26f97 Address Steve's review
vstinner88a62fe Add PyLong_Export to Doc/data/refcounts.dat
vstinner45517ab Address Serhiy's review
vstinner92007d1 Address Petr's review
vstinner6d3cb80 Add PyLongWriter to Doc/data/refcounts.dat
vstinnerFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
Revert "Add long_asnativebytes() function"
This reverts commit5d3e224.
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commita8fd66990491ab6d190a0e9bf648b05d332ee0f4
There are no files selected for viewing
106 changes: 48 additions & 58 deletionsObjects/longobject.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1117,18 +1117,53 @@ _resolve_endianness(int *endianness) | ||
| return 0; | ||
| } | ||
| Py_ssize_t | ||
| PyLong_AsNativeBytes(PyObject* vv, void* buffer, Py_ssize_t n, int flags) | ||
| { | ||
| PyLongObject *v; | ||
| union { | ||
| Py_ssize_t v; | ||
| unsigned char b[sizeof(Py_ssize_t)]; | ||
| } cv; | ||
| int do_decref = 0; | ||
| Py_ssize_t res = 0; | ||
| if (vv == NULL || n < 0) { | ||
| PyErr_BadInternalCall(); | ||
| return -1; | ||
| } | ||
| int little_endian = flags; | ||
| if (_resolve_endianness(&little_endian) < 0) { | ||
| return -1; | ||
| } | ||
| if (PyLong_Check(vv)) { | ||
| v = (PyLongObject *)vv; | ||
| } | ||
| else if (flags != -1 && (flags & Py_ASNATIVEBYTES_ALLOW_INDEX)) { | ||
| v = (PyLongObject *)_PyNumber_Index(vv); | ||
| if (v == NULL) { | ||
| return -1; | ||
| } | ||
| do_decref = 1; | ||
| } | ||
| else { | ||
| PyErr_Format(PyExc_TypeError, "expect int, got %T", vv); | ||
| return -1; | ||
| } | ||
| if ((flags != -1 && (flags & Py_ASNATIVEBYTES_REJECT_NEGATIVE)) | ||
| && _PyLong_IsNegative(v)) { | ||
| PyErr_SetString(PyExc_ValueError, "Cannot convert negative int"); | ||
| if (do_decref) { | ||
| Py_DECREF(v); | ||
| } | ||
| return -1; | ||
| } | ||
| if (_PyLong_IsCompact(v)) { | ||
| res = 0; | ||
| cv.v = _PyLong_CompactValue(v); | ||
| /* Most paths result in res = sizeof(compact value). Only the case | ||
| * where 0 < n < sizeof(compact value) do we need to check and adjust | ||
| @@ -1165,7 +1200,7 @@ long_asnativebytes(PyLongObject *v, void* buffer, Py_ssize_t n, | ||
| /* Positive values with the MSB set do not require an | ||
| * additional bit when the caller's intent is to treat them | ||
| * as unsigned. */ | ||
| if (flags == -1 || (flags & Py_ASNATIVEBYTES_UNSIGNED_BUFFER)) { | ||
| res = n; | ||
| } else { | ||
| res = n + 1; | ||
| @@ -1252,7 +1287,7 @@ long_asnativebytes(PyLongObject *v, void* buffer, Py_ssize_t n, | ||
| * as unsigned. */ | ||
| unsigned char *b = (unsigned char *)buffer; | ||
| if (b[little_endian ? n - 1 : 0] & 0x80) { | ||
| if (flags == -1 || (flags & Py_ASNATIVEBYTES_UNSIGNED_BUFFER)) { | ||
| res = n; | ||
| } else { | ||
| res = n + 1; | ||
| @@ -1261,54 +1296,6 @@ long_asnativebytes(PyLongObject *v, void* buffer, Py_ssize_t n, | ||
| } | ||
| } | ||
| } | ||
| if (do_decref) { | ||
| Py_DECREF(v); | ||
| @@ -6810,11 +6797,13 @@ PyLong_Export(PyObject *obj, PyLongExport *export_long) | ||
| PyErr_Format(PyExc_TypeError, "expect int, got %T", obj); | ||
| return -1; | ||
| } | ||
| int64_t value; | ||
| int flags = Py_ASNATIVEBYTES_NATIVE_ENDIAN; | ||
| Py_ssize_t bytes = PyLong_AsNativeBytes(obj, &value, sizeof(value), flags); | ||
| if (bytes < 0) { | ||
| return -1; | ||
vstinner marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| } | ||
| if ((size_t)bytes <= sizeof(value)) { | ||
| export_long->value = value; | ||
| @@ -6824,6 +6813,7 @@ PyLong_Export(PyObject *obj, PyLongExport *export_long) | ||
| export_long->_reserved = 0; | ||
| } | ||
| else { | ||
| PyLongObject *self = (PyLongObject*)obj; | ||
| export_long->value = 0; | ||
| export_long->negative = _PyLong_IsNegative(self); | ||
| export_long->ndigits = _PyLong_DigitCount(self); | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.