Skip to content

gh-119981: use do { ... } while(0) in some multi-line macros #119982

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
merged 6 commits into from
Jun 3, 2024
Merged

gh-119981: use do { ... } while(0) in some multi-line macros #119982

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6143080
use do { ... } while(0) in some macros
picnixz Jun 3, 2024
5e200d4
fixup
picnixz Jun 3, 2024
e003ac3
fixup
picnixz Jun 3, 2024
12a0c8e
Merge branch 'main' into use-do-while-in-macros
picnixz Jun 3, 2024
86db9ba
address review
picnixz Jun 3, 2024
1129661
fixup
picnixz Jun 3, 2024
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
97 changes: 52 additions & 45 deletions Python/symtable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,16 +601,17 @@ error_at_directive(PySTEntryObject *ste, PyObject *name)
global: set of all symbol names explicitly declared as global
*/

#define SET_SCOPE(DICT, NAME, I) { \
PyObject *o = PyLong_FromLong(I); \
if (!o) \
return 0; \
if (PyDict_SetItem((DICT), (NAME), o) < 0) { \
#define SET_SCOPE(DICT, NAME, I) \
do { \
PyObject *o = PyLong_FromLong(I); \
if (!o) \
return 0; \
if (PyDict_SetItem((DICT), (NAME), o) < 0) { \
Py_DECREF(o); \
return 0; \
} \
Py_DECREF(o); \
return 0; \
} \
Py_DECREF(o); \
}
} while(0)

/* Decide on scope of name, given flags.

Expand Down Expand Up @@ -1562,39 +1563,45 @@ symtable_enter_type_param_block(struct symtable *st, identifier name,
return --(ST)->recursion_depth,(X)

#define VISIT(ST, TYPE, V) \
if (!symtable_visit_ ## TYPE((ST), (V))) \
VISIT_QUIT((ST), 0);

#define VISIT_SEQ(ST, TYPE, SEQ) { \
int i; \
asdl_ ## TYPE ## _seq *seq = (SEQ); /* avoid variable capture */ \
for (i = 0; i < asdl_seq_LEN(seq); i++) { \
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
if (!symtable_visit_ ## TYPE((ST), elt)) \
VISIT_QUIT((ST), 0); \
} \
}

#define VISIT_SEQ_TAIL(ST, TYPE, SEQ, START) { \
int i; \
asdl_ ## TYPE ## _seq *seq = (SEQ); /* avoid variable capture */ \
for (i = (START); i < asdl_seq_LEN(seq); i++) { \
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
if (!symtable_visit_ ## TYPE((ST), elt)) \
VISIT_QUIT((ST), 0); \
} \
}

#define VISIT_SEQ_WITH_NULL(ST, TYPE, SEQ) { \
int i = 0; \
asdl_ ## TYPE ## _seq *seq = (SEQ); /* avoid variable capture */ \
for (i = 0; i < asdl_seq_LEN(seq); i++) { \
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
if (!elt) continue; /* can be NULL */ \
if (!symtable_visit_ ## TYPE((ST), elt)) \
VISIT_QUIT((ST), 0); \
} \
}
do { \
if (!symtable_visit_ ## TYPE((ST), (V))) { \
VISIT_QUIT((ST), 0); \
} \
} while(0)

#define VISIT_SEQ(ST, TYPE, SEQ) \
do { \
int i; \
asdl_ ## TYPE ## _seq *seq = (SEQ); /* avoid variable capture */ \
for (i = 0; i < asdl_seq_LEN(seq); i++) { \
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
if (!symtable_visit_ ## TYPE((ST), elt)) \
VISIT_QUIT((ST), 0); \
} \
} while(0)

#define VISIT_SEQ_TAIL(ST, TYPE, SEQ, START) \
do { \
int i; \
asdl_ ## TYPE ## _seq *seq = (SEQ); /* avoid variable capture */ \
for (i = (START); i < asdl_seq_LEN(seq); i++) { \
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
if (!symtable_visit_ ## TYPE((ST), elt)) \
VISIT_QUIT((ST), 0); \
} \
} while(0)

#define VISIT_SEQ_WITH_NULL(ST, TYPE, SEQ) \
do { \
int i = 0; \
asdl_ ## TYPE ## _seq *seq = (SEQ); /* avoid variable capture */ \
for (i = 0; i < asdl_seq_LEN(seq); i++) { \
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
if (!elt) continue; /* can be NULL */ \
if (!symtable_visit_ ## TYPE((ST), elt)) \
VISIT_QUIT((ST), 0); \
} \
} while(0)

static int
symtable_record_directive(struct symtable *st, identifier name, int lineno,
Expand Down Expand Up @@ -2261,11 +2268,11 @@ symtable_visit_expr(struct symtable *st, expr_ty e)
break;
case Slice_kind:
if (e->v.Slice.lower)
VISIT(st, expr, e->v.Slice.lower)
VISIT(st, expr, e->v.Slice.lower);
if (e->v.Slice.upper)
VISIT(st, expr, e->v.Slice.upper)
VISIT(st, expr, e->v.Slice.upper);
if (e->v.Slice.step)
VISIT(st, expr, e->v.Slice.step)
VISIT(st, expr, e->v.Slice.step);
break;
case Name_kind:
if (!symtable_add_def(st, e->v.Name.id,
Expand Down