Skip to content

bpo-40334: Improve various PEG-Parser related stuff #19669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pablogsal merged 7 commits into from
Apr 23, 2020
Merged

bpo-40334: Improve various PEG-Parser related stuff #19669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70b9712
bpo-40334: Improve various PEG-Parser related stuff
lysnikolaou Apr 22, 2020
68a81f1
Revert changes that conflict with another PR
lysnikolaou Apr 23, 2020
f020c0a
Address feedback
lysnikolaou Apr 23, 2020
cb42515
Set p->size when memory allocation for a Token fails
lysnikolaou Apr 23, 2020
39cf86b
Fix init_normalization
lysnikolaou Apr 23, 2020
62ae3f9
Fix refcount issue in raise_tokenizer_init_error
lysnikolaou Apr 23, 2020
94c456c
Respond to latest feedback
lysnikolaou Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address feedback
  • Loading branch information
@lysnikolaou
lysnikolaou committed Apr 23, 2020
commit f020c0ae67542f11e525c84bb51c48e815ae9b7d
4 changes: 4 additions & 0 deletions Include/internal/pegen_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
extern "C" {
#endif

#ifndef Py_BUILD_CORE
# error "this header requires Py_BUILD_CORE define"
#endif

#include "Python.h"
#include "Python-ast.h"

Expand Down
13 changes: 6 additions & 7 deletions Parser/pegen/pegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,8 +542,7 @@ _PyPegen_fill_token(Parser *p)
int newsize = p->size * 2;
Token **new_tokens = PyMem_Realloc(p->tokens, newsize * sizeof(Token *));
if (new_tokens == NULL) {
PyMem_Free(p->tokens);
p->tokens = NULL;
PyErr_NoMemory();
return -1;
}
else {
Expand Down Expand Up @@ -630,6 +629,7 @@ _PyPegen_is_memoized(Parser *p, int type, void *pres)
{
if (p->mark == p->fill) {
if (_PyPegen_fill_token(p) < 0) {
p->error_indicator = 1;
return -1;
}
}
Expand Down Expand Up @@ -687,6 +687,7 @@ _PyPegen_expect_token(Parser *p, int type)
{
if (p->mark == p->fill) {
if (_PyPegen_fill_token(p) < 0) {
p->error_indicator = 1;
return NULL;
}
}
Expand Down Expand Up @@ -876,12 +877,10 @@ void
_PyPegen_Parser_Free(Parser *p)
{
Py_XDECREF(p->normalize);
if (p->tokens) {
for (int i = 0; i < p->size; i++) {
PyMem_Free(p->tokens[i]);
}
PyMem_Free(p->tokens);
for (int i = 0; i < p->size; i++) {
PyMem_Free(p->tokens[i]);
}
PyMem_Free(p->tokens);
PyMem_Free(p);
}

Expand Down