Skip to content

Commit 4885e7d

Browse files
loewisloewis
committed
Prefix AST symbols with _Py_. Fixes #1637022.
Will backport.
1 parent a6c0b59 commit 4885e7d

3 files changed

Lines changed: 153 additions & 88 deletions

File tree

‎Include/Python-ast.h‎

Lines changed: 145 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -349,95 +349,153 @@ struct _alias {
349349
};
350350

351351

352-
mod_ty Module(asdl_seq * body, PyArena *arena);
353-
mod_ty Interactive(asdl_seq * body, PyArena *arena);
354-
mod_ty Expression(expr_ty body, PyArena *arena);
355-
mod_ty Suite(asdl_seq * body, PyArena *arena);
356-
stmt_ty FunctionDef(identifier name, arguments_ty args, asdl_seq * body,
357-
asdl_seq * decorators, int lineno, int col_offset, PyArena
358-
*arena);
359-
stmt_ty ClassDef(identifier name, asdl_seq * bases, asdl_seq * body, int
360-
lineno, int col_offset, PyArena *arena);
361-
stmt_ty Return(expr_ty value, int lineno, int col_offset, PyArena *arena);
362-
stmt_ty Delete(asdl_seq * targets, int lineno, int col_offset, PyArena *arena);
363-
stmt_ty Assign(asdl_seq * targets, expr_ty value, int lineno, int col_offset,
364-
PyArena *arena);
365-
stmt_ty AugAssign(expr_ty target, operator_ty op, expr_ty value, int lineno,
366-
int col_offset, PyArena *arena);
367-
stmt_ty Print(expr_ty dest, asdl_seq * values, bool nl, int lineno, int
368-
col_offset, PyArena *arena);
369-
stmt_ty For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * orelse,
370-
int lineno, int col_offset, PyArena *arena);
371-
stmt_ty While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, int
372-
col_offset, PyArena *arena);
373-
stmt_ty If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, int
374-
col_offset, PyArena *arena);
375-
stmt_ty With(expr_ty context_expr, expr_ty optional_vars, asdl_seq * body, int
376-
lineno, int col_offset, PyArena *arena);
377-
stmt_ty Raise(expr_ty type, expr_ty inst, expr_ty tback, int lineno, int
378-
col_offset, PyArena *arena);
379-
stmt_ty TryExcept(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse, int
380-
lineno, int col_offset, PyArena *arena);
381-
stmt_ty TryFinally(asdl_seq * body, asdl_seq * finalbody, int lineno, int
352+
#define Module(a0, a1) _Py_Module(a0, a1)
353+
mod_ty _Py_Module(asdl_seq * body, PyArena *arena);
354+
#define Interactive(a0, a1) _Py_Interactive(a0, a1)
355+
mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena);
356+
#define Expression(a0, a1) _Py_Expression(a0, a1)
357+
mod_ty _Py_Expression(expr_ty body, PyArena *arena);
358+
#define Suite(a0, a1) _Py_Suite(a0, a1)
359+
mod_ty _Py_Suite(asdl_seq * body, PyArena *arena);
360+
#define FunctionDef(a0, a1, a2, a3, a4, a5, a6) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6)
361+
stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body,
362+
asdl_seq * decorators, int lineno, int col_offset,
363+
PyArena *arena);
364+
#define ClassDef(a0, a1, a2, a3, a4, a5) _Py_ClassDef(a0, a1, a2, a3, a4, a5)
365+
stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * body, int
366+
lineno, int col_offset, PyArena *arena);
367+
#define Return(a0, a1, a2, a3) _Py_Return(a0, a1, a2, a3)
368+
stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, PyArena *arena);
369+
#define Delete(a0, a1, a2, a3) _Py_Delete(a0, a1, a2, a3)
370+
stmt_ty _Py_Delete(asdl_seq * targets, int lineno, int col_offset, PyArena
371+
*arena);
372+
#define Assign(a0, a1, a2, a3, a4) _Py_Assign(a0, a1, a2, a3, a4)
373+
stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, int lineno, int
382374
col_offset, PyArena *arena);
383-
stmt_ty Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, PyArena
384-
*arena);
385-
stmt_ty Import(asdl_seq * names, int lineno, int col_offset, PyArena *arena);
386-
stmt_ty ImportFrom(identifier module, asdl_seq * names, int level, int lineno,
387-
int col_offset, PyArena *arena);
388-
stmt_ty Exec(expr_ty body, expr_ty globals, expr_ty locals, int lineno, int
389-
col_offset, PyArena *arena);
390-
stmt_ty Global(asdl_seq * names, int lineno, int col_offset, PyArena *arena);
391-
stmt_ty Expr(expr_ty value, int lineno, int col_offset, PyArena *arena);
392-
stmt_ty Pass(int lineno, int col_offset, PyArena *arena);
393-
stmt_ty Break(int lineno, int col_offset, PyArena *arena);
394-
stmt_ty Continue(int lineno, int col_offset, PyArena *arena);
395-
expr_ty BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset,
396-
PyArena *arena);
397-
expr_ty BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int
398-
col_offset, PyArena *arena);
399-
expr_ty UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset,
400-
PyArena *arena);
401-
expr_ty Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset,
402-
PyArena *arena);
403-
expr_ty IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int
404-
col_offset, PyArena *arena);
405-
expr_ty Dict(asdl_seq * keys, asdl_seq * values, int lineno, int col_offset,
406-
PyArena *arena);
407-
expr_ty ListComp(expr_ty elt, asdl_seq * generators, int lineno, int
375+
#define AugAssign(a0, a1, a2, a3, a4, a5) _Py_AugAssign(a0, a1, a2, a3, a4, a5)
376+
stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int
377+
lineno, int col_offset, PyArena *arena);
378+
#define Print(a0, a1, a2, a3, a4, a5) _Py_Print(a0, a1, a2, a3, a4, a5)
379+
stmt_ty _Py_Print(expr_ty dest, asdl_seq * values, bool nl, int lineno, int
380+
col_offset, PyArena *arena);
381+
#define For(a0, a1, a2, a3, a4, a5, a6) _Py_For(a0, a1, a2, a3, a4, a5, a6)
382+
stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
383+
orelse, int lineno, int col_offset, PyArena *arena);
384+
#define While(a0, a1, a2, a3, a4, a5) _Py_While(a0, a1, a2, a3, a4, a5)
385+
stmt_ty _Py_While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
386+
int col_offset, PyArena *arena);
387+
#define If(a0, a1, a2, a3, a4, a5) _Py_If(a0, a1, a2, a3, a4, a5)
388+
stmt_ty _Py_If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
389+
int col_offset, PyArena *arena);
390+
#define With(a0, a1, a2, a3, a4, a5) _Py_With(a0, a1, a2, a3, a4, a5)
391+
stmt_ty _Py_With(expr_ty context_expr, expr_ty optional_vars, asdl_seq * body,
392+
int lineno, int col_offset, PyArena *arena);
393+
#define Raise(a0, a1, a2, a3, a4, a5) _Py_Raise(a0, a1, a2, a3, a4, a5)
394+
stmt_ty _Py_Raise(expr_ty type, expr_ty inst, expr_ty tback, int lineno, int
395+
col_offset, PyArena *arena);
396+
#define TryExcept(a0, a1, a2, a3, a4, a5) _Py_TryExcept(a0, a1, a2, a3, a4, a5)
397+
stmt_ty _Py_TryExcept(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse,
398+
int lineno, int col_offset, PyArena *arena);
399+
#define TryFinally(a0, a1, a2, a3, a4) _Py_TryFinally(a0, a1, a2, a3, a4)
400+
stmt_ty _Py_TryFinally(asdl_seq * body, asdl_seq * finalbody, int lineno, int
401+
col_offset, PyArena *arena);
402+
#define Assert(a0, a1, a2, a3, a4) _Py_Assert(a0, a1, a2, a3, a4)
403+
stmt_ty _Py_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset,
404+
PyArena *arena);
405+
#define Import(a0, a1, a2, a3) _Py_Import(a0, a1, a2, a3)
406+
stmt_ty _Py_Import(asdl_seq * names, int lineno, int col_offset, PyArena
407+
*arena);
408+
#define ImportFrom(a0, a1, a2, a3, a4, a5) _Py_ImportFrom(a0, a1, a2, a3, a4, a5)
409+
stmt_ty _Py_ImportFrom(identifier module, asdl_seq * names, int level, int
410+
lineno, int col_offset, PyArena *arena);
411+
#define Exec(a0, a1, a2, a3, a4, a5) _Py_Exec(a0, a1, a2, a3, a4, a5)
412+
stmt_ty _Py_Exec(expr_ty body, expr_ty globals, expr_ty locals, int lineno, int
413+
col_offset, PyArena *arena);
414+
#define Global(a0, a1, a2, a3) _Py_Global(a0, a1, a2, a3)
415+
stmt_ty _Py_Global(asdl_seq * names, int lineno, int col_offset, PyArena
416+
*arena);
417+
#define Expr(a0, a1, a2, a3) _Py_Expr(a0, a1, a2, a3)
418+
stmt_ty _Py_Expr(expr_ty value, int lineno, int col_offset, PyArena *arena);
419+
#define Pass(a0, a1, a2) _Py_Pass(a0, a1, a2)
420+
stmt_ty _Py_Pass(int lineno, int col_offset, PyArena *arena);
421+
#define Break(a0, a1, a2) _Py_Break(a0, a1, a2)
422+
stmt_ty _Py_Break(int lineno, int col_offset, PyArena *arena);
423+
#define Continue(a0, a1, a2) _Py_Continue(a0, a1, a2)
424+
stmt_ty _Py_Continue(int lineno, int col_offset, PyArena *arena);
425+
#define BoolOp(a0, a1, a2, a3, a4) _Py_BoolOp(a0, a1, a2, a3, a4)
426+
expr_ty _Py_BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset,
427+
PyArena *arena);
428+
#define BinOp(a0, a1, a2, a3, a4, a5) _Py_BinOp(a0, a1, a2, a3, a4, a5)
429+
expr_ty _Py_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int
430+
col_offset, PyArena *arena);
431+
#define UnaryOp(a0, a1, a2, a3, a4) _Py_UnaryOp(a0, a1, a2, a3, a4)
432+
expr_ty _Py_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset,
433+
PyArena *arena);
434+
#define Lambda(a0, a1, a2, a3, a4) _Py_Lambda(a0, a1, a2, a3, a4)
435+
expr_ty _Py_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset,
436+
PyArena *arena);
437+
#define IfExp(a0, a1, a2, a3, a4, a5) _Py_IfExp(a0, a1, a2, a3, a4, a5)
438+
expr_ty _Py_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int
439+
col_offset, PyArena *arena);
440+
#define Dict(a0, a1, a2, a3, a4) _Py_Dict(a0, a1, a2, a3, a4)
441+
expr_ty _Py_Dict(asdl_seq * keys, asdl_seq * values, int lineno, int
408442
col_offset, PyArena *arena);
409-
expr_ty GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int
443+
#define ListComp(a0, a1, a2, a3, a4) _Py_ListComp(a0, a1, a2, a3, a4)
444+
expr_ty _Py_ListComp(expr_ty elt, asdl_seq * generators, int lineno, int
410445
col_offset, PyArena *arena);
411-
expr_ty Yield(expr_ty value, int lineno, int col_offset, PyArena *arena);
412-
expr_ty Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators, int
413-
lineno, int col_offset, PyArena *arena);
414-
expr_ty Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty
415-
starargs, expr_ty kwargs, int lineno, int col_offset, PyArena
416-
*arena);
417-
expr_ty Repr(expr_ty value, int lineno, int col_offset, PyArena *arena);
418-
expr_ty Num(object n, int lineno, int col_offset, PyArena *arena);
419-
expr_ty Str(string s, int lineno, int col_offset, PyArena *arena);
420-
expr_ty Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int
421-
lineno, int col_offset, PyArena *arena);
422-
expr_ty Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int
423-
lineno, int col_offset, PyArena *arena);
424-
expr_ty Name(identifier id, expr_context_ty ctx, int lineno, int col_offset,
425-
PyArena *arena);
426-
expr_ty List(asdl_seq * elts, expr_context_ty ctx, int lineno, int col_offset,
427-
PyArena *arena);
428-
expr_ty Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int col_offset,
429-
PyArena *arena);
430-
slice_ty Ellipsis(PyArena *arena);
431-
slice_ty Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena);
432-
slice_ty ExtSlice(asdl_seq * dims, PyArena *arena);
433-
slice_ty Index(expr_ty value, PyArena *arena);
434-
comprehension_ty comprehension(expr_ty target, expr_ty iter, asdl_seq * ifs,
435-
PyArena *arena);
436-
excepthandler_ty excepthandler(expr_ty type, expr_ty name, asdl_seq * body, int
437-
lineno, int col_offset, PyArena *arena);
438-
arguments_ty arguments(asdl_seq * args, identifier vararg, identifier kwarg,
439-
asdl_seq * defaults, PyArena *arena);
440-
keyword_ty keyword(identifier arg, expr_ty value, PyArena *arena);
441-
alias_ty alias(identifier name, identifier asname, PyArena *arena);
446+
#define GeneratorExp(a0, a1, a2, a3, a4) _Py_GeneratorExp(a0, a1, a2, a3, a4)
447+
expr_ty _Py_GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int
448+
col_offset, PyArena *arena);
449+
#define Yield(a0, a1, a2, a3) _Py_Yield(a0, a1, a2, a3)
450+
expr_ty _Py_Yield(expr_ty value, int lineno, int col_offset, PyArena *arena);
451+
#define Compare(a0, a1, a2, a3, a4, a5) _Py_Compare(a0, a1, a2, a3, a4, a5)
452+
expr_ty _Py_Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators,
453+
int lineno, int col_offset, PyArena *arena);
454+
#define Call(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Call(a0, a1, a2, a3, a4, a5, a6, a7)
455+
expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty
456+
starargs, expr_ty kwargs, int lineno, int col_offset, PyArena
457+
*arena);
458+
#define Repr(a0, a1, a2, a3) _Py_Repr(a0, a1, a2, a3)
459+
expr_ty _Py_Repr(expr_ty value, int lineno, int col_offset, PyArena *arena);
460+
#define Num(a0, a1, a2, a3) _Py_Num(a0, a1, a2, a3)
461+
expr_ty _Py_Num(object n, int lineno, int col_offset, PyArena *arena);
462+
#define Str(a0, a1, a2, a3) _Py_Str(a0, a1, a2, a3)
463+
expr_ty _Py_Str(string s, int lineno, int col_offset, PyArena *arena);
464+
#define Attribute(a0, a1, a2, a3, a4, a5) _Py_Attribute(a0, a1, a2, a3, a4, a5)
465+
expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int
466+
lineno, int col_offset, PyArena *arena);
467+
#define Subscript(a0, a1, a2, a3, a4, a5) _Py_Subscript(a0, a1, a2, a3, a4, a5)
468+
expr_ty _Py_Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int
469+
lineno, int col_offset, PyArena *arena);
470+
#define Name(a0, a1, a2, a3, a4) _Py_Name(a0, a1, a2, a3, a4)
471+
expr_ty _Py_Name(identifier id, expr_context_ty ctx, int lineno, int
472+
col_offset, PyArena *arena);
473+
#define List(a0, a1, a2, a3, a4) _Py_List(a0, a1, a2, a3, a4)
474+
expr_ty _Py_List(asdl_seq * elts, expr_context_ty ctx, int lineno, int
475+
col_offset, PyArena *arena);
476+
#define Tuple(a0, a1, a2, a3, a4) _Py_Tuple(a0, a1, a2, a3, a4)
477+
expr_ty _Py_Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int
478+
col_offset, PyArena *arena);
479+
#define Ellipsis(a0) _Py_Ellipsis(a0)
480+
slice_ty _Py_Ellipsis(PyArena *arena);
481+
#define Slice(a0, a1, a2, a3) _Py_Slice(a0, a1, a2, a3)
482+
slice_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena);
483+
#define ExtSlice(a0, a1) _Py_ExtSlice(a0, a1)
484+
slice_ty _Py_ExtSlice(asdl_seq * dims, PyArena *arena);
485+
#define Index(a0, a1) _Py_Index(a0, a1)
486+
slice_ty _Py_Index(expr_ty value, PyArena *arena);
487+
#define comprehension(a0, a1, a2, a3) _Py_comprehension(a0, a1, a2, a3)
488+
comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq *
489+
ifs, PyArena *arena);
490+
#define excepthandler(a0, a1, a2, a3, a4, a5) _Py_excepthandler(a0, a1, a2, a3, a4, a5)
491+
excepthandler_ty _Py_excepthandler(expr_ty type, expr_ty name, asdl_seq * body,
492+
int lineno, int col_offset, PyArena *arena);
493+
#define arguments(a0, a1, a2, a3, a4) _Py_arguments(a0, a1, a2, a3, a4)
494+
arguments_ty _Py_arguments(asdl_seq * args, identifier vararg, identifier
495+
kwarg, asdl_seq * defaults, PyArena *arena);
496+
#define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2)
497+
keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena);
498+
#define alias(a0, a1, a2) _Py_alias(a0, a1, a2)
499+
alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena);
442500

443501
PyObject* PyAST_mod2obj(mod_ty t);

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
1212
Core and builtins
1313
-----------------
1414

15+
- Bug #1637022: Prefix AST symbols with _Py_.
16+
1517
- Prevent seg fault on shutdown which could occur if an object
1618
raised a warning.
1719

‎Parser/asdl_c.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,12 @@ def emit_function(self, name, ctype, args, attrs, union=1):
260260
argstr += ", PyArena *arena"
261261
else:
262262
argstr = "PyArena *arena"
263-
self.emit("%s %s(%s);" % (ctype, name, argstr), 0)
263+
margs = "a0"
264+
for i in range(1, len(args)+1):
265+
margs += ", a%d" % i
266+
self.emit("#define %s(%s) _Py_%s(%s)" % (name, margs, name, margs), 0,
267+
reflow = 0)
268+
self.emit("%s _Py_%s(%s);" % (ctype, name, argstr), 0)
264269

265270
def visitProduct(self, prod, name):
266271
self.emit_function(name, get_c_type(name),

0 commit comments

Comments
 (0)