[Python-checkins] Fix a shadow-compatible-local warning (#2181)
Łukasz Langa
webhook-mailer at python.org
Fri Aug 4 13:53:45 EDT 2017
https://github.com/python/cpython/commit/a0cb7db8e4b928b4c06da4bde8695555276958f0
commit: a0cb7db8e4b928b4c06da4bde8695555276958f0
branch: 3.6
author: Yuan Chao Chou <oswinchou at gmail.com>
committer: Łukasz Langa <lukasz at langa.pl>
date: 2017-08-04T10:53:42-07:00
summary:
Fix a shadow-compatible-local warning (#2181)
Change the shadowing naming, 'value' (Python-ast.c:4686), to 'val'
to prevent the variables from being misused.
files:
M Parser/asdl_c.py
M Python/Python-ast.c
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 725d73bad47..13124bbd3ad 100644
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -522,8 +522,8 @@ def visitField(self, field, name, sum=None, prod=None, depth=0):
self.emit("%s = _Py_asdl_seq_new(len, arena);" % field.name, depth+1)
self.emit("if (%s == NULL) goto failed;" % field.name, depth+1)
self.emit("for (i = 0; i < len; i++) {", depth+1)
- self.emit("%s value;" % ctype, depth+2)
- self.emit("res = obj2ast_%s(PyList_GET_ITEM(tmp, i), &value, arena);" %
+ self.emit("%s val;" % ctype, depth+2)
+ self.emit("res = obj2ast_%s(PyList_GET_ITEM(tmp, i), &val, arena);" %
field.type, depth+2, reflow=False)
self.emit("if (res != 0) goto failed;", depth+2)
self.emit("if (len != PyList_GET_SIZE(tmp)) {", depth+2)
@@ -533,7 +533,7 @@ def visitField(self, field, name, sum=None, prod=None, depth=0):
depth+3, reflow=False)
self.emit("goto failed;", depth+3)
self.emit("}", depth+2)
- self.emit("asdl_seq_SET(%s, i, value);" % field.name, depth+2)
+ self.emit("asdl_seq_SET(%s, i, val);" % field.name, depth+2)
self.emit("}", depth+1)
else:
self.emit("res = obj2ast_%s(tmp, &%s, arena);" %
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index e0607ba9ae6..b78a0fc714e 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -3994,14 +3994,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Module field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4033,14 +4033,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Interactive field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4094,14 +4094,14 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Suite field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4201,14 +4201,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4229,14 +4229,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
decorator_list = _Py_asdl_seq_new(len, arena);
if (decorator_list == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"decorator_list\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(decorator_list, i, value);
+ asdl_seq_SET(decorator_list, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4305,14 +4305,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncFunctionDef field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4333,14 +4333,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
decorator_list = _Py_asdl_seq_new(len, arena);
if (decorator_list == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncFunctionDef field \"decorator_list\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(decorator_list, i, value);
+ asdl_seq_SET(decorator_list, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4398,14 +4398,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
bases = _Py_asdl_seq_new(len, arena);
if (bases == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"bases\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(bases, i, value);
+ asdl_seq_SET(bases, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4426,14 +4426,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
keywords = _Py_asdl_seq_new(len, arena);
if (keywords == NULL) goto failed;
for (i = 0; i < len; i++) {
- keyword_ty value;
- res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
+ keyword_ty val;
+ res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"keywords\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(keywords, i, value);
+ asdl_seq_SET(keywords, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4454,14 +4454,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4482,14 +4482,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
decorator_list = _Py_asdl_seq_new(len, arena);
if (decorator_list == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"decorator_list\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(decorator_list, i, value);
+ asdl_seq_SET(decorator_list, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4543,14 +4543,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
targets = _Py_asdl_seq_new(len, arena);
if (targets == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Delete field \"targets\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(targets, i, value);
+ asdl_seq_SET(targets, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4583,14 +4583,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
targets = _Py_asdl_seq_new(len, arena);
if (targets == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Assign field \"targets\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(targets, i, value);
+ asdl_seq_SET(targets, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4762,14 +4762,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "For field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4790,14 +4790,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
orelse = _Py_asdl_seq_new(len, arena);
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "For field \"orelse\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(orelse, i, value);
+ asdl_seq_SET(orelse, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4854,14 +4854,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncFor field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4882,14 +4882,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
orelse = _Py_asdl_seq_new(len, arena);
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncFor field \"orelse\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(orelse, i, value);
+ asdl_seq_SET(orelse, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4934,14 +4934,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "While field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -4962,14 +4962,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
orelse = _Py_asdl_seq_new(len, arena);
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "While field \"orelse\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(orelse, i, value);
+ asdl_seq_SET(orelse, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5014,14 +5014,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "If field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5042,14 +5042,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
orelse = _Py_asdl_seq_new(len, arena);
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "If field \"orelse\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(orelse, i, value);
+ asdl_seq_SET(orelse, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5082,14 +5082,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
items = _Py_asdl_seq_new(len, arena);
if (items == NULL) goto failed;
for (i = 0; i < len; i++) {
- withitem_ty value;
- res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &value, arena);
+ withitem_ty val;
+ res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "With field \"items\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(items, i, value);
+ asdl_seq_SET(items, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5110,14 +5110,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "With field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5150,14 +5150,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
items = _Py_asdl_seq_new(len, arena);
if (items == NULL) goto failed;
for (i = 0; i < len; i++) {
- withitem_ty value;
- res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &value, arena);
+ withitem_ty val;
+ res = obj2ast_withitem(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncWith field \"items\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(items, i, value);
+ asdl_seq_SET(items, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5178,14 +5178,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncWith field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5252,14 +5252,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Try field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5280,14 +5280,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
handlers = _Py_asdl_seq_new(len, arena);
if (handlers == NULL) goto failed;
for (i = 0; i < len; i++) {
- excepthandler_ty value;
- res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &value, arena);
+ excepthandler_ty val;
+ res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Try field \"handlers\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(handlers, i, value);
+ asdl_seq_SET(handlers, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5308,14 +5308,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
orelse = _Py_asdl_seq_new(len, arena);
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Try field \"orelse\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(orelse, i, value);
+ asdl_seq_SET(orelse, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5336,14 +5336,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
finalbody = _Py_asdl_seq_new(len, arena);
if (finalbody == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Try field \"finalbody\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(finalbody, i, value);
+ asdl_seq_SET(finalbody, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5409,14 +5409,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
names = _Py_asdl_seq_new(len, arena);
if (names == NULL) goto failed;
for (i = 0; i < len; i++) {
- alias_ty value;
- res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
+ alias_ty val;
+ res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Import field \"names\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(names, i, value);
+ asdl_seq_SET(names, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5460,14 +5460,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
names = _Py_asdl_seq_new(len, arena);
if (names == NULL) goto failed;
for (i = 0; i < len; i++) {
- alias_ty value;
- res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
+ alias_ty val;
+ res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ImportFrom field \"names\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(names, i, value);
+ asdl_seq_SET(names, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5509,14 +5509,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
names = _Py_asdl_seq_new(len, arena);
if (names == NULL) goto failed;
for (i = 0; i < len; i++) {
- identifier value;
- res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
+ identifier val;
+ res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Global field \"names\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(names, i, value);
+ asdl_seq_SET(names, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5548,14 +5548,14 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
names = _Py_asdl_seq_new(len, arena);
if (names == NULL) goto failed;
for (i = 0; i < len; i++) {
- identifier value;
- res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
+ identifier val;
+ res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Nonlocal field \"names\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(names, i, value);
+ asdl_seq_SET(names, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5693,14 +5693,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
values = _Py_asdl_seq_new(len, arena);
if (values == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "BoolOp field \"values\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(values, i, value);
+ asdl_seq_SET(values, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5893,14 +5893,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
keys = _Py_asdl_seq_new(len, arena);
if (keys == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Dict field \"keys\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(keys, i, value);
+ asdl_seq_SET(keys, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5921,14 +5921,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
values = _Py_asdl_seq_new(len, arena);
if (values == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Dict field \"values\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(values, i, value);
+ asdl_seq_SET(values, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -5960,14 +5960,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
elts = _Py_asdl_seq_new(len, arena);
if (elts == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Set field \"elts\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(elts, i, value);
+ asdl_seq_SET(elts, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6011,14 +6011,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
generators = _Py_asdl_seq_new(len, arena);
if (generators == NULL) goto failed;
for (i = 0; i < len; i++) {
- comprehension_ty value;
- res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+ comprehension_ty val;
+ res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ListComp field \"generators\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(generators, i, value);
+ asdl_seq_SET(generators, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6062,14 +6062,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
generators = _Py_asdl_seq_new(len, arena);
if (generators == NULL) goto failed;
for (i = 0; i < len; i++) {
- comprehension_ty value;
- res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+ comprehension_ty val;
+ res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "SetComp field \"generators\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(generators, i, value);
+ asdl_seq_SET(generators, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6125,14 +6125,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
generators = _Py_asdl_seq_new(len, arena);
if (generators == NULL) goto failed;
for (i = 0; i < len; i++) {
- comprehension_ty value;
- res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+ comprehension_ty val;
+ res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "DictComp field \"generators\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(generators, i, value);
+ asdl_seq_SET(generators, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6176,14 +6176,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
generators = _Py_asdl_seq_new(len, arena);
if (generators == NULL) goto failed;
for (i = 0; i < len; i++) {
- comprehension_ty value;
- res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
+ comprehension_ty val;
+ res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "GeneratorExp field \"generators\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(generators, i, value);
+ asdl_seq_SET(generators, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6293,14 +6293,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
ops = _Py_asdl_int_seq_new(len, arena);
if (ops == NULL) goto failed;
for (i = 0; i < len; i++) {
- cmpop_ty value;
- res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &value, arena);
+ cmpop_ty val;
+ res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Compare field \"ops\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(ops, i, value);
+ asdl_seq_SET(ops, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6321,14 +6321,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
comparators = _Py_asdl_seq_new(len, arena);
if (comparators == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Compare field \"comparators\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(comparators, i, value);
+ asdl_seq_SET(comparators, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6373,14 +6373,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
args = _Py_asdl_seq_new(len, arena);
if (args == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Call field \"args\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(args, i, value);
+ asdl_seq_SET(args, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6401,14 +6401,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
keywords = _Py_asdl_seq_new(len, arena);
if (keywords == NULL) goto failed;
for (i = 0; i < len; i++) {
- keyword_ty value;
- res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
+ keyword_ty val;
+ res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Call field \"keywords\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(keywords, i, value);
+ asdl_seq_SET(keywords, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6529,14 +6529,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
values = _Py_asdl_seq_new(len, arena);
if (values == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "JoinedStr field \"values\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(values, i, value);
+ asdl_seq_SET(values, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6805,14 +6805,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
elts = _Py_asdl_seq_new(len, arena);
if (elts == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "List field \"elts\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(elts, i, value);
+ asdl_seq_SET(elts, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -6856,14 +6856,14 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
elts = _Py_asdl_seq_new(len, arena);
if (elts == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Tuple field \"elts\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(elts, i, value);
+ asdl_seq_SET(elts, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -7025,14 +7025,14 @@ obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena)
dims = _Py_asdl_seq_new(len, arena);
if (dims == NULL) goto failed;
for (i = 0; i < len; i++) {
- slice_ty value;
- res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &value, arena);
+ slice_ty val;
+ res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ExtSlice field \"dims\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(dims, i, value);
+ asdl_seq_SET(dims, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -7389,14 +7389,14 @@ obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena* arena)
ifs = _Py_asdl_seq_new(len, arena);
if (ifs == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "comprehension field \"ifs\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(ifs, i, value);
+ asdl_seq_SET(ifs, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -7499,14 +7499,14 @@ obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
body = _Py_asdl_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
- stmt_ty value;
- res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+ stmt_ty val;
+ res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ExceptHandler field \"body\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(body, i, value);
+ asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -7549,14 +7549,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
args = _Py_asdl_seq_new(len, arena);
if (args == NULL) goto failed;
for (i = 0; i < len; i++) {
- arg_ty value;
- res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &value, arena);
+ arg_ty val;
+ res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "arguments field \"args\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(args, i, value);
+ asdl_seq_SET(args, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -7587,14 +7587,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
kwonlyargs = _Py_asdl_seq_new(len, arena);
if (kwonlyargs == NULL) goto failed;
for (i = 0; i < len; i++) {
- arg_ty value;
- res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &value, arena);
+ arg_ty val;
+ res = obj2ast_arg(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "arguments field \"kwonlyargs\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(kwonlyargs, i, value);
+ asdl_seq_SET(kwonlyargs, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -7615,14 +7615,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
kw_defaults = _Py_asdl_seq_new(len, arena);
if (kw_defaults == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "arguments field \"kw_defaults\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(kw_defaults, i, value);
+ asdl_seq_SET(kw_defaults, i, val);
}
Py_CLEAR(tmp);
} else {
@@ -7653,14 +7653,14 @@ obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
defaults = _Py_asdl_seq_new(len, arena);
if (defaults == NULL) goto failed;
for (i = 0; i < len; i++) {
- expr_ty value;
- res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "arguments field \"defaults\" changed size during iteration");
goto failed;
}
- asdl_seq_SET(defaults, i, value);
+ asdl_seq_SET(defaults, i, val);
}
Py_CLEAR(tmp);
} else {
More information about the Python-checkins
mailing list