Refactor error handling code in Parser/pegen/pegen.c (GH-20440)
Set p->error_indicator in various places, where it's needed, but it's
not done.
Automerge-Triggered-By: @gvanrossum
diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c
index a0285bc..c55ff7e 100644
--- a/Parser/pegen/pegen.c
+++ b/Parser/pegen/pegen.c
@@ -775,15 +775,15 @@
if (t->type != NAME) {
return NULL;
}
- char* s = PyBytes_AsString(t->bytes);
+ char *s = PyBytes_AsString(t->bytes);
if (!s) {
+ p->error_indicator = 1;
return NULL;
}
if (strcmp(s, keyword) != 0) {
return NULL;
}
- expr_ty res = _PyPegen_name_token(p);
- return res;
+ return _PyPegen_name_token(p);
}
Token *
@@ -809,10 +809,12 @@
}
char* s = PyBytes_AsString(t->bytes);
if (!s) {
+ p->error_indicator = 1;
return NULL;
}
PyObject *id = _PyPegen_new_identifier(p, s);
if (id == NULL) {
+ p->error_indicator = 1;
return NULL;
}
return Name(id, Load, t->lineno, t->col_offset, t->end_lineno, t->end_col_offset,
@@ -905,6 +907,7 @@
char *num_raw = PyBytes_AsString(t->bytes);
if (num_raw == NULL) {
+ p->error_indicator = 1;
return NULL;
}
@@ -917,11 +920,13 @@
PyObject *c = parsenumber(num_raw);
if (c == NULL) {
+ p->error_indicator = 1;
return NULL;
}
if (PyArena_AddPyObject(p->arena, c) < 0) {
Py_DECREF(c);
+ p->error_indicator = 1;
return NULL;
}