Skip to content

gh-112301: Use literal format strings in unicode_fromformat_arg #124203

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
encukou merged 3 commits into from
Sep 25, 2024
Merged

gh-112301: Use literal format strings in unicode_fromformat_arg #124203

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ebc9ee
Generated code
encukou Sep 18, 2024
b562a43
Macros
encukou Sep 18, 2024
218929c
Put ;break; in the switch
encukou Sep 24, 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
Prev Previous commit
Put ;break; in the switch
  • Loading branch information
@encukou
encukou committed Sep 24, 2024
commit 218929c9b197e800ddff47319afb7dddde2bef1d
15 changes: 7 additions & 8 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2859,17 +2859,16 @@ unicode_fromformat_arg(_PyUnicodeWriter *writer,
case 'x': len = SPRINT(SIZE_SPEC, "x", UNSIGNED_TYPE); break; \
case 'X': len = SPRINT(SIZE_SPEC, "X", UNSIGNED_TYPE); break; \
default: len = SPRINT(SIZE_SPEC, "d", SIGNED_TYPE); break; \
} \
break;
}

// Outer switch to handle all the sizes/types
switch (sizemod) {
case F_LONG: DO_SPRINTS("l", long, unsigned long)
case F_LONGLONG: DO_SPRINTS("ll", long long, unsigned long long)
case F_SIZE: DO_SPRINTS("z", Py_ssize_t, size_t)
case F_PTRDIFF: DO_SPRINTS("t", ptrdiff_t, ptrdiff_t)
case F_INTMAX: DO_SPRINTS("j", intmax_t, uintmax_t)
default: DO_SPRINTS("", int, unsigned int)
case F_LONG: DO_SPRINTS("l", long, unsigned long); break;
case F_LONGLONG: DO_SPRINTS("ll", long long, unsigned long long); break;
case F_SIZE: DO_SPRINTS("z", Py_ssize_t, size_t); break;
case F_PTRDIFF: DO_SPRINTS("t", ptrdiff_t, ptrdiff_t); break;
case F_INTMAX: DO_SPRINTS("j", intmax_t, uintmax_t); break;
default: DO_SPRINTS("", int, unsigned int); break;
}
#undef SPRINT
#undef DO_SPRINTS
Expand Down