mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-09 18:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-43950: use 0-indexed column offsets for bytecode positions (GH-27011)

Browse source
This commit is contained in:
Batuhan Taskaya 2021-07-04 21:02:16 +03:00 • committed by GitHub
parent d33943a6c3
commit 44f91fc802
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Objects/codeobject.c
View file

@ -610,9 +610,6 @@ PyCode_Addr2Location(PyCodeObject *co, int addrq,
int *end_line, int *end_column)
{
*start_line = PyCode_Addr2Line(co, addrq);
if (*start_line == -1) {
*start_line = 0;
}
*start_column = _PyCode_Addr2Offset(co, addrq);
*end_line = _PyCode_Addr2EndLine(co, addrq);
*end_column = _PyCode_Addr2EndOffset(co, addrq);
@ -626,7 +623,7 @@ _PyCode_Addr2EndLine(PyCodeObject* co, int addrq)
return co->co_firstlineno;
}
else if (co->co_endlinetable == Py_None) {
return 0;
return -1;
}
assert(addrq >= 0 && addrq < PyBytes_GET_SIZE(co->co_code));
@ -639,34 +636,34 @@ int
_PyCode_Addr2Offset(PyCodeObject* co, int addrq)
{
if (co->co_columntable == Py_None || addrq < 0) {
return 0;
return -1;
}
if (addrq % 2 == 1) {
--addrq;
}
if (addrq >= PyBytes_GET_SIZE(co->co_columntable)) {
return 0;
return -1;
}
unsigned char* bytes = (unsigned char*)PyBytes_AS_STRING(co->co_columntable);
return bytes[addrq];
return bytes[addrq] - 1;
}
int
_PyCode_Addr2EndOffset(PyCodeObject* co, int addrq)
{
if (co->co_columntable == Py_None || addrq < 0) {
return 0;
return -1;
}
if (addrq % 2 == 0) {
++addrq;
}
if (addrq >= PyBytes_GET_SIZE(co->co_columntable)) {
return 0;
return -1;
}
unsigned char* bytes = (unsigned char*)PyBytes_AS_STRING(co->co_columntable);
return bytes[addrq];
return bytes[addrq] - 1;
}
void
@ -980,7 +977,7 @@ positionsiter_dealloc(positionsiterator* pi)
static PyObject*
_source_offset_converter(int* value) {
if (*value <= 0) {
if (*value == -1) {
Py_RETURN_NONE;
}
return PyLong_FromLong(*value);