Mercurial > cpython-lru_cache-weakref
diff Python/ast.c @ 35870:f531c05cd240 legacy-trunk
Convert all internal errors from Exception to SystemError
Remove an abort() and let a SystemError be raised.
| author | Neal Norwitz <nnorwitz@gmail.com> |
|---|---|
| date | Mon, 14 Nov 2005 04:25:03 +0000 |
| parents | 37da969ad116 |
| children | 76ed7fdc9d85 |
line wrap: on
line diff
--- a/Python/ast.c Mon Nov 14 00:47:57 2005 +0000 +++ b/Python/ast.c Mon Nov 14 04:25:03 2005 +0000 @@ -448,7 +448,7 @@ else return Mult; default: - PyErr_Format(PyExc_Exception, "invalid augassign: %s", STR(n)); + PyErr_Format(PyExc_SystemError, "invalid augassign: %s", STR(n)); return 0; } } @@ -481,7 +481,7 @@ if (strcmp(STR(n), "is") == 0) return Is; default: - PyErr_Format(PyExc_Exception, "invalid comp_op: %s", + PyErr_Format(PyExc_SystemError, "invalid comp_op: %s", STR(n)); return 0; } @@ -495,12 +495,12 @@ if (strcmp(STR(CHILD(n, 0)), "is") == 0) return IsNot; default: - PyErr_Format(PyExc_Exception, "invalid comp_op: %s %s", + PyErr_Format(PyExc_SystemError, "invalid comp_op: %s %s", STR(CHILD(n, 0)), STR(CHILD(n, 1))); return 0; } } - PyErr_Format(PyExc_Exception, "invalid comp_op: has %d children", + PyErr_Format(PyExc_SystemError, "invalid comp_op: has %d children", NCH(n)); return 0; } @@ -669,7 +669,7 @@ i += 3; break; default: - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "unexpected node in varargslist: %d @ %d", TYPE(ch), i); goto error; @@ -1309,8 +1309,7 @@ return Repr(expression, LINENO(n)); } default: - PyErr_Format(PyExc_Exception, "unhandled atom %d", - TYPE(ch)); + PyErr_Format(PyExc_SystemError, "unhandled atom %d", TYPE(ch)); return NULL; } } @@ -1680,8 +1679,7 @@ case power: return ast_for_power(c, n); default: - abort(); - PyErr_Format(PyExc_Exception, "unhandled expr: %d", TYPE(n)); + PyErr_Format(PyExc_SystemError, "unhandled expr: %d", TYPE(n)); return NULL; } /* should never get here */ @@ -2131,7 +2129,7 @@ return Raise(expr1, expr2, expr3, LINENO(n)); } default: - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "unexpected flow_stmt: %d", TYPE(ch)); return NULL; } @@ -2202,7 +2200,7 @@ case STAR: return alias(PyString_InternFromString("*"), NULL); default: - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "unexpected import name: %d", TYPE(n)); return NULL; } @@ -2304,7 +2302,7 @@ free_alias(mod); return import; } - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "unknown import statement: starts with command '%s'", STR(CHILD(n, 0))); return NULL; @@ -2339,7 +2337,7 @@ expr_ty expr1, globals = NULL, locals = NULL; int n_children = NCH(n); if (n_children != 2 && n_children != 4 && n_children != 6) { - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "poorly formed 'exec' statement: %d parts to statement", n_children); return NULL; @@ -2387,7 +2385,7 @@ return Assert(expr1, expr2, LINENO(n)); } - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "improper number of parts to 'assert' statement: %d", NCH(n)); return NULL; @@ -2574,7 +2572,7 @@ orelse, LINENO(n)); } else { - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "unexpected token in 'if' statement: %s", s); return NULL; } @@ -2615,7 +2613,7 @@ return While(expression, seq1, seq2, LINENO(n)); } else { - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "wrong number of tokens for 'while' statement: %d", NCH(n)); return NULL; @@ -2702,7 +2700,7 @@ return excepthandler(expression, e, suite_seq); } else { - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "wrong number of children for 'except' clause: %d", NCH(exc)); return NULL; @@ -2847,7 +2845,7 @@ case assert_stmt: return ast_for_assert_stmt(c, n); default: - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "unhandled small_stmt: TYPE=%d NCH=%d\n", TYPE(n), NCH(n)); return NULL; @@ -2873,7 +2871,7 @@ case classdef: return ast_for_classdef(c, ch); default: - PyErr_Format(PyExc_Exception, + PyErr_Format(PyExc_SystemError, "unhandled small_stmt: TYPE=%d NCH=%d\n", TYPE(n), NCH(n)); return NULL;