mirror of
https://github.com/python/cpython
synced 2024-09-16 04:09:56 +00:00
9932a22897
The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points:
* It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`.
* I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient.
* Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear.
* For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in
```python
class C:
pass
pass
```
the end line and end column for the class definition is (2, 8).
* For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node.
* I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing.
An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
49 lines
1.3 KiB
C
49 lines
1.3 KiB
C
|
|
/* Parse tree node interface */
|
|
|
|
#ifndef Py_NODE_H
|
|
#define Py_NODE_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef struct _node {
|
|
short n_type;
|
|
char *n_str;
|
|
int n_lineno;
|
|
int n_col_offset;
|
|
int n_nchildren;
|
|
struct _node *n_child;
|
|
int n_end_lineno;
|
|
int n_end_col_offset;
|
|
} node;
|
|
|
|
PyAPI_FUNC(node *) PyNode_New(int type);
|
|
PyAPI_FUNC(int) PyNode_AddChild(node *n, int type,
|
|
char *str, int lineno, int col_offset,
|
|
int end_lineno, int end_col_offset);
|
|
PyAPI_FUNC(void) PyNode_Free(node *n);
|
|
#ifndef Py_LIMITED_API
|
|
PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
|
|
#endif
|
|
|
|
/* Node access functions */
|
|
#define NCH(n) ((n)->n_nchildren)
|
|
|
|
#define CHILD(n, i) (&(n)->n_child[i])
|
|
#define RCHILD(n, i) (CHILD(n, NCH(n) + i))
|
|
#define TYPE(n) ((n)->n_type)
|
|
#define STR(n) ((n)->n_str)
|
|
#define LINENO(n) ((n)->n_lineno)
|
|
|
|
/* Assert that the type of a node is what we expect */
|
|
#define REQ(n, type) assert(TYPE(n) == (type))
|
|
|
|
PyAPI_FUNC(void) PyNode_ListTree(node *);
|
|
void _PyNode_FinalizeEndPos(node *n); // helper also used in parsetok.c
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_NODE_H */
|