Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-125196: Use PyUnicodeWriter in parser (#125271) 

Replace the private _PyUnicodeWriter API with the public
PyUnicodeWriter API in _PyPegen_concatenate_strings().
This commit is contained in:
Victor Stinner 2024-10-12 09:28:34 +02:00 committed by GitHub
parent 5d8739e956
commit 4a943c3251
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Parser/action_helpers.c
View File

@ -1615,7 +1615,6 @@ _PyPegen_concatenate_strings(Parser *p, asdl_expr_seq *strings,
} }
/* build folded list */ /* build folded list */
_PyUnicodeWriter writer;
current_pos = 0; current_pos = 0;
for (i = 0; i < n_flattened_elements; i++) { for (i = 0; i < n_flattened_elements; i++) {
expr_ty elem = asdl_seq_GET(flattened, i); expr_ty elem = asdl_seq_GET(flattened, i);
@ -1635,14 +1634,17 @@ _PyPegen_concatenate_strings(Parser *p, asdl_expr_seq *strings,
"abc" u"abc" -> "abcabc" */ "abc" u"abc" -> "abcabc" */
PyObject *kind = elem->v.Constant.kind; PyObject *kind = elem->v.Constant.kind;
_PyUnicodeWriter_Init(&writer); PyUnicodeWriter *writer = PyUnicodeWriter_Create(0);
if (writer == NULL) {
return NULL;
}
expr_ty last_elem = elem; expr_ty last_elem = elem;
for (j = i; j < n_flattened_elements; j++) { for (j = i; j < n_flattened_elements; j++) {
expr_ty current_elem = asdl_seq_GET(flattened, j); expr_ty current_elem = asdl_seq_GET(flattened, j);
if (current_elem->kind == Constant_kind) { if (current_elem->kind == Constant_kind) {
if (_PyUnicodeWriter_WriteStr( if (PyUnicodeWriter_WriteStr(writer,
&writer, current_elem->v.Constant.value)) { current_elem->v.Constant.value)) {
_PyUnicodeWriter_Dealloc(&writer); PyUnicodeWriter_Discard(writer);
return NULL; return NULL;
} }
last_elem = current_elem; last_elem = current_elem;
@ -1652,9 +1654,8 @@ _PyPegen_concatenate_strings(Parser *p, asdl_expr_seq *strings,
} }
i = j - 1; i = j - 1;
PyObject *concat_str = _PyUnicodeWriter_Finish(&writer); PyObject *concat_str = PyUnicodeWriter_Finish(writer);
if (concat_str == NULL) { if (concat_str == NULL) {
_PyUnicodeWriter_Dealloc(&writer);
return NULL; return NULL;
} }
if (_PyArena_AddPyObject(p->arena, concat_str) < 0) { if (_PyArena_AddPyObject(p->arena, concat_str) < 0) {