Skip to content

bpo-32711: Fix warnings for Python/ast_unparse.c #5426

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
tiran merged 2 commits into from
Feb 1, 2018
Merged

bpo-32711: Fix warnings for Python/ast_unparse.c #5426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff6d17
bpo-32711: Fix warnings for Python/ast_unparse.c
matrixise Jan 29, 2018
bf5b727
Use Py_UNREACHABLE();
matrixise Jan 30, 2018
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2018-01-29-14-36-37.bpo-32711.8hQFJP.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix the warning messages for Python/ast_unparse.c. Patch by Stéphane Wirtel
10 changes: 7 additions & 3 deletions Python/ast_unparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ append_formattedvalue(_PyUnicodeWriter *writer, expr_ty e, bool is_format_spec);
static int
append_charp(_PyUnicodeWriter *writer, const char *charp)
{
return _PyUnicodeWriter_WriteASCIIString(writer, charp, -1);
return _PyUnicodeWriter_WriteASCIIString(writer, charp, -1);
}

static int
Expand Down Expand Up @@ -100,6 +100,8 @@ append_ast_binop(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)
case BitAnd: op = " & "; break;
case FloorDiv: op = " // "; break;
case Pow: op = " ** "; break;
default:
Py_UNREACHABLE();
}

if (-1 == append_charp(writer, op)) {
Expand Down Expand Up @@ -127,6 +129,8 @@ append_ast_unaryop(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)
case Not: op = "not "; break;
case UAdd: op = "+"; break;
case USub: op = "-"; break;
default:
Py_UNREACHABLE();
}

if (-1 == append_charp(writer, op)) {
Expand Down Expand Up @@ -856,7 +860,7 @@ append_formattedvalue(_PyUnicodeWriter *writer, expr_ty e, bool is_format_spec)
return -1;
}
}
if (e->v.FormattedValue.format_spec > 0) {
if (e->v.FormattedValue.format_spec) {
if (-1 == _PyUnicodeWriter_WriteASCIIString(writer, ":", 1) ||
-1 == append_fstring_element(writer,
e->v.FormattedValue.format_spec,
Expand Down Expand Up @@ -1119,7 +1123,7 @@ append_ast_expr(_PyUnicodeWriter *writer, expr_ty e, bool omit_parens)
}

static int
maybe_init_static_strings()
maybe_init_static_strings(void)
{
if (!_str_open_br &&
!(_str_open_br = PyUnicode_InternFromString("{"))) {
Expand Down