mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 86545 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86545 | benjamin.peterson | 2010-11-19 22:31:07 -0600 (Fri, 19 Nov 2010) | 1 line

  new plan: functions that want 'tmp' can declare it
........
This commit is contained in:
Benjamin Peterson 2010-11-20 04:37:00 +00:00
parent fdd52bea44
commit 787cddc93d
2 changed files with 6 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Parser/asdl_c.py
View file

@ -365,10 +365,7 @@ class Obj2ModVisitor(PickleVisitor):
self.emit("int", 0) self.emit("int", 0)
self.emit("obj2ast_%s(PyObject* obj, %s* out, PyArena* arena)" % (name, ctype), 0) self.emit("obj2ast_%s(PyObject* obj, %s* out, PyArena* arena)" % (name, ctype), 0)
self.emit("{", 0) self.emit("{", 0)
self.emit("PyObject* tmp = NULL;", 1)
self.emit("int isinstance;", 1) self.emit("int isinstance;", 1)
# Prevent compiler warnings about unused variable.
self.emit("tmp = tmp;", 1)
self.emit("", 0) self.emit("", 0)
def sumTrailer(self, name, add_label=False): def sumTrailer(self, name, add_label=False):
@ -403,6 +400,7 @@ class Obj2ModVisitor(PickleVisitor):
def complexSum(self, sum, name): def complexSum(self, sum, name):
self.funcHeader(name) self.funcHeader(name)
self.emit("PyObject *tmp = NULL;", 1)
for a in sum.attributes: for a in sum.attributes:
self.visitAttributeDeclaration(a, name, sum=sum) self.visitAttributeDeclaration(a, name, sum=sum)
self.emit("", 0) self.emit("", 0)

25
Python/Python-ast.c
View file

@ -3378,10 +3378,9 @@ failed:
int int
obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena) obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
PyObject *tmp = NULL;
if (obj == Py_None) { if (obj == Py_None) {
*out = NULL; *out = NULL;
@ -3527,10 +3526,9 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
int int
obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena) obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
PyObject *tmp = NULL;
int lineno; int lineno;
int col_offset; int col_offset;
@ -4724,10 +4722,9 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
int int
obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena) obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
PyObject *tmp = NULL;
int lineno; int lineno;
int col_offset; int col_offset;
@ -5840,9 +5837,7 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
int int
obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena* arena) obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)Load_type); isinstance = PyObject_IsInstance(obj, (PyObject *)Load_type);
if (isinstance == -1) { if (isinstance == -1) {
@ -5900,10 +5895,9 @@ obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena* arena)
int int
obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena) obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
PyObject *tmp = NULL;
if (obj == Py_None) { if (obj == Py_None) {
*out = NULL; *out = NULL;
@ -6023,9 +6017,7 @@ obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena)
int int
obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena) obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)And_type); isinstance = PyObject_IsInstance(obj, (PyObject *)And_type);
if (isinstance == -1) { if (isinstance == -1) {
@ -6051,9 +6043,7 @@ obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena)
int int
obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena) obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)Add_type); isinstance = PyObject_IsInstance(obj, (PyObject *)Add_type);
if (isinstance == -1) { if (isinstance == -1) {
@ -6159,9 +6149,7 @@ obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena)
int int
obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena) obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)Invert_type); isinstance = PyObject_IsInstance(obj, (PyObject *)Invert_type);
if (isinstance == -1) { if (isinstance == -1) {
@ -6203,9 +6191,7 @@ obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena)
int int
obj2ast_cmpop(PyObject* obj, cmpop_ty* out, PyArena* arena) obj2ast_cmpop(PyObject* obj, cmpop_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)Eq_type); isinstance = PyObject_IsInstance(obj, (PyObject *)Eq_type);
if (isinstance == -1) { if (isinstance == -1) {
@ -6359,10 +6345,9 @@ failed:
int int
obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena) obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL;
int isinstance; int isinstance;
tmp = tmp;
PyObject *tmp = NULL;
int lineno; int lineno;
int col_offset; int col_offset;