[Python-checkins] r86546 - in python/branches/release31-maint: Parser/asdl_c.py Python/Python-ast.c
benjamin.peterson
python-checkins at python.org
Sat Nov 20 05:37:00 CET 2010
Author: benjamin.peterson
Date: Sat Nov 20 05:37:00 2010
New Revision: 86546
Log:
Merged revisions 86545 via svnmerge from
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
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Parser/asdl_c.py
python/branches/release31-maint/Python/Python-ast.c
Modified: python/branches/release31-maint/Parser/asdl_c.py
==============================================================================
--- python/branches/release31-maint/Parser/asdl_c.py (original)
+++ python/branches/release31-maint/Parser/asdl_c.py Sat Nov 20 05:37:00 2010
@@ -365,10 +365,7 @@
self.emit("int", 0)
self.emit("obj2ast_%s(PyObject* obj, %s* out, PyArena* arena)" % (name, ctype), 0)
self.emit("{", 0)
- self.emit("PyObject* tmp = NULL;", 1)
self.emit("int isinstance;", 1)
- # Prevent compiler warnings about unused variable.
- self.emit("tmp = tmp;", 1)
self.emit("", 0)
def sumTrailer(self, name, add_label=False):
@@ -403,6 +400,7 @@
def complexSum(self, sum, name):
self.funcHeader(name)
+ self.emit("PyObject *tmp = NULL;", 1)
for a in sum.attributes:
self.visitAttributeDeclaration(a, name, sum=sum)
self.emit("", 0)
Modified: python/branches/release31-maint/Python/Python-ast.c
==============================================================================
--- python/branches/release31-maint/Python/Python-ast.c (original)
+++ python/branches/release31-maint/Python/Python-ast.c Sat Nov 20 05:37:00 2010
@@ -3378,10 +3378,9 @@
int
obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
+ PyObject *tmp = NULL;
if (obj == Py_None) {
*out = NULL;
@@ -3527,10 +3526,9 @@
int
obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
+ PyObject *tmp = NULL;
int lineno;
int col_offset;
@@ -4724,10 +4722,9 @@
int
obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
+ PyObject *tmp = NULL;
int lineno;
int col_offset;
@@ -5840,9 +5837,7 @@
int
obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)Load_type);
if (isinstance == -1) {
@@ -5900,10 +5895,9 @@
int
obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
+ PyObject *tmp = NULL;
if (obj == Py_None) {
*out = NULL;
@@ -6023,9 +6017,7 @@
int
obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)And_type);
if (isinstance == -1) {
@@ -6051,9 +6043,7 @@
int
obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)Add_type);
if (isinstance == -1) {
@@ -6159,9 +6149,7 @@
int
obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)Invert_type);
if (isinstance == -1) {
@@ -6203,9 +6191,7 @@
int
obj2ast_cmpop(PyObject* obj, cmpop_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
isinstance = PyObject_IsInstance(obj, (PyObject *)Eq_type);
if (isinstance == -1) {
@@ -6359,10 +6345,9 @@
int
obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
{
- PyObject* tmp = NULL;
int isinstance;
- tmp = tmp;
+ PyObject *tmp = NULL;
int lineno;
int col_offset;
More information about the Python-checkins
mailing list