Skip to content

gh-87347: Add parenthesis around macro arguments #93915

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
vstinner merged 6 commits into from
Jun 20, 2022
Merged

gh-87347: Add parenthesis around macro arguments #93915

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1ace1c
gh-87347: Add parenthesis around macro arguments
vstinner May 13, 2022
f4dc859
Revert invalid changes
vstinner Jun 16, 2022
82684c6
Revert _PyObject_ASSERT_WITH_MSG() change
vstinner Jun 17, 2022
7ee3032
Revert invalid pycore_code.h changes
vstinner Jun 20, 2022
784aaa6
Revert invalid Py_MEMBER_SIZE() change
vstinner Jun 20, 2022
b486600
Fix static_assert() usage
vstinner Jun 20, 2022
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
Prev Previous commit
Next Next commit
Revert _PyObject_ASSERT_WITH_MSG() change 
Don't add parenthesis in the assert error message.
  • Loading branch information
@vstinner
vstinner committed Jun 17, 2022
commit 82684c633550ac97fa4b09c83b553f366bf6d85a
4 changes: 2 additions & 2 deletions Include/cpython/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,9 @@ _PyObject_DebugTypeStats(FILE *out);
#endif

#define _PyObject_ASSERT_WITH_MSG(obj, expr, msg) \
_PyObject_ASSERT_FROM((obj), (expr), (msg), __FILE__, __LINE__, __func__)
_PyObject_ASSERT_FROM((obj), expr, (msg), __FILE__, __LINE__, __func__)
#define _PyObject_ASSERT(obj, expr) \
_PyObject_ASSERT_WITH_MSG((obj), (expr), NULL)
_PyObject_ASSERT_WITH_MSG((obj), expr, NULL)

#define _PyObject_ASSERT_FAILED_MSG(obj, msg) \
_PyObject_AssertFailed((obj), NULL, (msg), __FILE__, __LINE__, __func__)
Expand Down