diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-05-29 09:04:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 09:04:55 (GMT) |
| commit | 73cbe7a01a22d02dbe1ec841e8779c775cad3d08 (patch) | |
| tree | 0c39a8adb1cebdfc95cc991223c6c278fb13100a /Include | |
| parent | 2179022d94937d7b0600b0dc192ca6fa5f53d830 (diff) | |
| download | cpython-73cbe7a01a22d02dbe1ec841e8779c775cad3d08.zip cpython-73cbe7a01a22d02dbe1ec841e8779c775cad3d08.tar.gz cpython-73cbe7a01a22d02dbe1ec841e8779c775cad3d08.tar.bz2 | |
bpo-32911: Revert bpo-29463. (GH-7121) (GH-7197)
Remove the docstring attribute of AST types and restore docstring
expression as a first stmt in their body.
Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/Python-ast.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/Include/Python-ast.h b/Include/Python-ast.h index 26dfef8..8e0f750 100644 --- a/Include/Python-ast.h +++ b/Include/Python-ast.h @@ -46,7 +46,6 @@ struct _mod { union { struct { asdl_seq *body; - string docstring; } Module; struct { @@ -81,7 +80,6 @@ struct _stmt { asdl_seq *body; asdl_seq *decorator_list; expr_ty returns; - string docstring; } FunctionDef; struct { @@ -90,7 +88,6 @@ struct _stmt { asdl_seq *body; asdl_seq *decorator_list; expr_ty returns; - string docstring; } AsyncFunctionDef; struct { @@ -99,7 +96,6 @@ struct _stmt { asdl_seq *keywords; asdl_seq *body; asdl_seq *decorator_list; - string docstring; } ClassDef; struct { @@ -443,27 +439,26 @@ struct _withitem { }; -#define Module(a0, a1, a2) _Py_Module(a0, a1, a2) -mod_ty _Py_Module(asdl_seq * body, string docstring, PyArena *arena); +#define Module(a0, a1) _Py_Module(a0, a1) +mod_ty _Py_Module(asdl_seq * body, PyArena *arena); #define Interactive(a0, a1) _Py_Interactive(a0, a1) mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena); #define Expression(a0, a1) _Py_Expression(a0, a1) mod_ty _Py_Expression(expr_ty body, PyArena *arena); #define Suite(a0, a1) _Py_Suite(a0, a1) mod_ty _Py_Suite(asdl_seq * body, PyArena *arena); -#define FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8) +#define FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7) stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body, - asdl_seq * decorator_list, expr_ty returns, string - docstring, int lineno, int col_offset, PyArena *arena); -#define AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8) _Py_AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8) + asdl_seq * decorator_list, expr_ty returns, int lineno, + int col_offset, PyArena *arena); +#define AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7) _Py_AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7) stmt_ty _Py_AsyncFunctionDef(identifier name, arguments_ty args, asdl_seq * body, asdl_seq * decorator_list, expr_ty returns, - string docstring, int lineno, int col_offset, - PyArena *arena); -#define ClassDef(a0, a1, a2, a3, a4, a5, a6, a7, a8) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6, a7, a8) + int lineno, int col_offset, PyArena *arena); +#define ClassDef(a0, a1, a2, a3, a4, a5, a6, a7) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6, a7) stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * keywords, - asdl_seq * body, asdl_seq * decorator_list, string - docstring, int lineno, int col_offset, PyArena *arena); + asdl_seq * body, asdl_seq * decorator_list, int lineno, + int col_offset, PyArena *arena); #define Return(a0, a1, a2, a3) _Py_Return(a0, a1, a2, a3) stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, PyArena *arena); #define Delete(a0, a1, a2, a3) _Py_Delete(a0, a1, a2, a3) |