Skip to content

bpo-42246: Partial implementation of PEP 626. #23113

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

Merged
markshannon merged 11 commits into from
Nov 12, 2020
Merged

bpo-42246: Partial implementation of PEP 626. #23113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8bc98a7
New line number table format. Mostly working.
markshannon Jul 10, 2020
766a298
Implement code.co_lines. WIP.
markshannon Jul 14, 2020
4b5347d
Change line number format to be more robust for iterators.
markshannon Aug 4, 2020
792079e
Mark some bytecodes as articifial.
markshannon Aug 4, 2020
8e5732e
Rename 'NOP' as 'PASS'.
markshannon Aug 4, 2020
a243390
Add code.co_lines() and fix up various tests.
markshannon Aug 5, 2020
4c5cad9
Implement API as defined in PEP 626.
markshannon Aug 7, 2020
f5dfec7
Fix 'off by one' error in line table pointer.
markshannon Aug 9, 2020
140a3f3
Add news entry.
markshannon Nov 2, 2020
06febf2
Update importlib.
markshannon Nov 10, 2020
6f02bad
Fix up test edits.
markshannon Nov 10, 2020
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
Next Next commit
New line number table format. Mostly working.
  • Loading branch information
@markshannon
markshannon committed Oct 29, 2020
commit 8bc98a785cd7cf34e9c47474798384bb5b79a7bb
20 changes: 13 additions & 7 deletions Include/cpython/code.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct PyCodeObject {
Py_ssize_t *co_cell2arg; /* Maps cell vars which are arguments. */
PyObject *co_filename; /* unicode (where it was loaded from) */
PyObject *co_name; /* unicode (name, for reference) */
PyObject *co_lnotab; /* string (encoding addr<->lineno mapping) See
PyObject *co_linetable; /* string (encoding addr<->lineno mapping) See
Objects/lnotab_notes.txt for details. */
void *co_zombieframe; /* for optimization only (see frameobject.c) */
PyObject *co_weakreflist; /* to support weakrefs to code objects */
Expand Down Expand Up @@ -135,16 +135,22 @@ PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno);
PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int);

/* for internal use only */
typedef struct _addr_pair {
int ap_lower;
int ap_upper;
} PyAddrPair;
typedef struct _line_offsets {
int lo_start;
int lo_end;
int lo_line;
char *lo_entry;
char lo_artificial;
} PyAddrLineOffsets;


int
_PyCode_InitBounds(PyCodeObject* co, PyAddrLineOffsets *bounds);

/* Update *bounds to describe the first and one-past-the-last instructions in the
same line as lasti. Return the number of that line.
*/
PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co,
int lasti, PyAddrPair *bounds);
PyAPI_FUNC(int) _PyCode_CheckLineNumber(int lasti, PyAddrLineOffsets *bounds);

/* Create a comparable key used to compare constants taking in account the
* object type. It is used to make sure types are not coerced (e.g., float and
Expand Down
26 changes: 13 additions & 13 deletions Objects/clinic/codeobject.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading