low-hanging fruit in Python/ - g++ still hates all the enum_kind declarations

in Python/Python-ast.c. Not sure what to do about those.

diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 792f81db8930cd8d0cfb967809600ec1a50fe8df..b8c1925fcc5a88d5896a113673e839c9af0fb8c4 100644 (file)
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -2328,6 +2328,8 @@ ast2obj_stmt(void* _o)
                 result = PyType_GenericNew(Continue_type, NULL, NULL);
                 if (!result) goto failed;
                 break;
+        default:
+                ;
         }
         value = ast2obj_int(o->lineno);
         if (!value) goto failed;

diff --git a/Python/ast.c b/Python/ast.c
index ea8c10366eaa0ef7fd9a837364918d39cdbe8283..e6d7c72d401d6fd455f7733630fd1712447d6c66 100644 (file)
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1365,7 +1365,7 @@ ast_for_binop(struct compiling *c, const node *n)
 
        int i, nops;
        expr_ty expr1, expr2, result;
-        operator_ty operator;
+        operator_ty newoperator;
 
         expr1 = ast_for_expr(c, CHILD(n, 0));
         if (!expr1)
@@ -1375,11 +1375,11 @@ ast_for_binop(struct compiling *c, const node *n)
         if (!expr2)
             return NULL;
 
-        operator = get_operator(CHILD(n, 1));
-        if (!operator)
+        newoperator = get_operator(CHILD(n, 1));
+        if (!newoperator)
             return NULL;
 
-       result = BinOp(expr1, operator, expr2, LINENO(n), n->n_col_offset,
+       result = BinOp(expr1, newoperator, expr2, LINENO(n), n->n_col_offset,
                        c->c_arena);
        if (!result)
             return NULL;
@@ -1389,15 +1389,15 @@ ast_for_binop(struct compiling *c, const node *n)
                expr_ty tmp_result, tmp;
                const node* next_oper = CHILD(n, i * 2 + 1);
 
-               operator = get_operator(next_oper);
-                if (!operator)
+               newoperator = get_operator(next_oper);
+                if (!newoperator)
                     return NULL;
 
                 tmp = ast_for_expr(c, CHILD(n, i * 2 + 2));
                 if (!tmp)
                     return NULL;
 
-                tmp_result = BinOp(result, operator, tmp, 
+                tmp_result = BinOp(result, newoperator, tmp, 
                                   LINENO(next_oper), next_oper->n_col_offset,
                                    c->c_arena);
                if (!tmp) 
@@ -1610,10 +1610,10 @@ ast_for_expr(struct compiling *c, const node *n)
                 }
                 for (i = 1; i < NCH(n); i += 2) {
                     /* XXX cmpop_ty is just an enum */
-                    cmpop_ty operator;
+                    cmpop_ty newoperator;
 
-                    operator = ast_for_comp_op(CHILD(n, i));
-                    if (!operator) {
+                    newoperator = ast_for_comp_op(CHILD(n, i));
+                    if (!newoperator) {
                         return NULL;
                    }
 
@@ -1622,7 +1622,7 @@ ast_for_expr(struct compiling *c, const node *n)
                         return NULL;
                    }
                         
-                    asdl_seq_SET(ops, i / 2, (void *)(Py_uintptr_t)operator);
+                    asdl_seq_SET(ops, i / 2, (void *)(Py_uintptr_t)newoperator);
                     asdl_seq_SET(cmps, i / 2, expression);
                 }
                 expression = ast_for_expr(c, CHILD(n, 0));
@@ -1882,7 +1882,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n)
     }
     else if (TYPE(CHILD(n, 1)) == augassign) {
         expr_ty expr1, expr2;
-        operator_ty operator;
+        operator_ty newoperator;
        node *ch = CHILD(n, 0);
 
        if (TYPE(ch) == testlist)
@@ -1924,11 +1924,11 @@ ast_for_expr_stmt(struct compiling *c, const node *n)
         if (!expr2)
             return NULL;
 
-        operator = ast_for_augassign(CHILD(n, 1));
-        if (!operator)
+        newoperator = ast_for_augassign(CHILD(n, 1));
+        if (!newoperator)
             return NULL;
 
-       return AugAssign(expr1, operator, expr2, LINENO(n), n->n_col_offset, c->c_arena);
+       return AugAssign(expr1, newoperator, expr2, LINENO(n), n->n_col_offset, c->c_arena);
     }
     else {
        int i;
@@ -2541,8 +2541,8 @@ ast_for_if_stmt(struct compiling *c, const node *n)
            int off = 5 + (n_elif - i - 1) * 4;
             expr_ty expression;
             asdl_seq *suite_seq;
-           asdl_seq *new = asdl_seq_new(1, c->c_arena);
-           if (!new)
+           asdl_seq *newobj = asdl_seq_new(1, c->c_arena);
+           if (!newobj)
                return NULL;
             expression = ast_for_expr(c, CHILD(n, off));
             if (!expression)
@@ -2551,10 +2551,10 @@ ast_for_if_stmt(struct compiling *c, const node *n)
             if (!suite_seq)
                 return NULL;
 
-           asdl_seq_SET(new, 0,
+           asdl_seq_SET(newobj, 0,
                         If(expression, suite_seq, orelse, 
                            LINENO(CHILD(n, off)), CHILD(n, off)->n_col_offset, c->c_arena));
-           orelse = new;
+           orelse = newobj;
        }
        return If(ast_for_expr(c, CHILD(n, 1)),
                  ast_for_suite(c, CHILD(n, 3)),

diff --git a/Python/ceval.c b/Python/ceval.c
index 6302ede18f05dc3901f2ebafbd738d72ed2b732f..cb89769df19b3fffaaade39ab03d0f7a3edb5712 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -507,7 +507,7 @@ PyEval_EvalFrame(PyFrameObject *f) {
 }
 
 PyObject *
-PyEval_EvalFrameEx(PyFrameObject *f, int throw)
+PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
 {
 #ifdef DXPAIRS
        int lastopcode = 0;
@@ -756,7 +756,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throw)
        x = Py_None;    /* Not a reference, just anything non-NULL */
        w = NULL;
 
-       if (throw) { /* support for generator.throw() */
+       if (throwflag) { /* support for generator.throw() */
                why = WHY_EXCEPTION;
                goto on_error;
        }

diff --git a/Python/exceptions.c b/Python/exceptions.c
index b146c971b9c87a4c77f9dc261ea19c5fa6288233..e5f8f05cfb70df8448ce86939e362df84fab8405 100644 (file)
--- a/Python/exceptions.c
+++ b/Python/exceptions.c
@@ -893,7 +893,7 @@ SyntaxError__str__(PyObject *self, PyObject *args)
            if (have_filename)
                bufsize += PyString_GET_SIZE(filename);
 
-           buffer = PyMem_MALLOC(bufsize);
+           buffer = (char *)PyMem_MALLOC(bufsize);
            if (buffer != NULL) {
                if (have_filename && have_lineno)
                    PyOS_snprintf(buffer, bufsize, "%s (%s, line %ld)",