[Python-checkins] Refactor error handling code in Parser/pegen/pegen.c (GH-20440)
Lysandros Nikolaou
webhook-mailer at python.org
Wed May 27 12:04:20 EDT 2020
https://github.com/python/cpython/commit/526e23f1538134b728c21ac71ac977ae9e6a8de6
commit: 526e23f1538134b728c21ac71ac977ae9e6a8de6
branch: master
author: Lysandros Nikolaou <lisandrosnik at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020-05-27T09:04:11-07:00
summary:
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
files:
M Parser/pegen/pegen.c
diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c
index a0285bcb60e95..c55ff7e45c0da 100644
--- a/Parser/pegen/pegen.c
+++ b/Parser/pegen/pegen.c
@@ -775,15 +775,15 @@ _PyPegen_expect_soft_keyword(Parser *p, const char *keyword)
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 @@ _PyPegen_name_token(Parser *p)
}
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 @@ _PyPegen_number_token(Parser *p)
char *num_raw = PyBytes_AsString(t->bytes);
if (num_raw == NULL) {
+ p->error_indicator = 1;
return NULL;
}
@@ -917,11 +920,13 @@ _PyPegen_number_token(Parser *p)
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;
}
More information about the Python-checkins
mailing list