bpo-40334: Make the PyPegen* and PyParser* APIs more consistent (GH-19839)
This commit makes both APIs more consistent by doing the following:
- Remove the `PyPegen_CodeObjectFrom*` functions, which weren't used
and will probably not be needed. Functions like `Py_CompileStringObject`
can be used instead.
- Include a `const char *filename` parameter in `PyPegen_ASTFromString`.
- Rename `PyPegen_ASTFromFile` to `PyPegen_ASTFromFilename`, because
its signature is not the same with `PyParser_ASTFromFile`.
diff --git a/Parser/pegen/peg_api.c b/Parser/pegen/peg_api.c
index 31ac2e1..5e71ecd 100644
--- a/Parser/pegen/peg_api.c
+++ b/Parser/pegen/peg_api.c
@@ -4,9 +4,10 @@
#include "pegen.h"
mod_ty
-PyPegen_ASTFromString(const char *str, int mode, PyCompilerFlags *flags, PyArena *arena)
+PyPegen_ASTFromString(const char *str, const char *filename, int mode,
+ PyCompilerFlags *flags, PyArena *arena)
{
- PyObject *filename_ob = PyUnicode_FromString("<string>");
+ PyObject *filename_ob = PyUnicode_FromString(filename);
if (filename_ob == NULL) {
return NULL;
}
@@ -16,7 +17,8 @@
}
mod_ty
-PyPegen_ASTFromStringObject(const char *str, PyObject* filename, int mode, PyCompilerFlags *flags, PyArena *arena)
+PyPegen_ASTFromStringObject(const char *str, PyObject* filename, int mode,
+ PyCompilerFlags *flags, PyArena *arena)
{
if (PySys_Audit("compile", "yO", str, filename) < 0) {
return NULL;
@@ -27,7 +29,7 @@
}
mod_ty
-PyPegen_ASTFromFile(const char *filename, int mode, PyCompilerFlags *flags, PyArena *arena)
+PyPegen_ASTFromFilename(const char *filename, int mode, PyCompilerFlags *flags, PyArena *arena)
{
PyObject *filename_ob = PyUnicode_FromString(filename);
if (filename_ob == NULL) {
@@ -50,84 +52,3 @@
return _PyPegen_run_parser_from_file_pointer(fp, mode, filename_ob, enc, ps1, ps2,
flags, errcode, arena);
}
-
-PyCodeObject *
-PyPegen_CodeObjectFromString(const char *str, int mode, PyCompilerFlags *flags)
-{
- PyArena *arena = PyArena_New();
- if (arena == NULL) {
- return NULL;
- }
-
- PyCodeObject *result = NULL;
-
- PyObject *filename_ob = PyUnicode_FromString("<string>");
- if (filename_ob == NULL) {
- goto error;
- }
-
- mod_ty res = PyPegen_ASTFromString(str, mode, flags, arena);
- if (res == NULL) {
- goto error;
- }
-
- result = PyAST_CompileObject(res, filename_ob, NULL, -1, arena);
-
-error:
- Py_XDECREF(filename_ob);
- PyArena_Free(arena);
- return result;
-}
-
-PyCodeObject *
-PyPegen_CodeObjectFromFile(const char *filename, int mode, PyCompilerFlags* flags)
-{
- PyArena *arena = PyArena_New();
- if (arena == NULL) {
- return NULL;
- }
-
- PyCodeObject *result = NULL;
-
- PyObject *filename_ob = PyUnicode_FromString(filename);
- if (filename_ob == NULL) {
- goto error;
- }
-
- mod_ty res = PyPegen_ASTFromFile(filename, mode, flags, arena);
- if (res == NULL) {
- goto error;
- }
-
- result = PyAST_CompileObject(res, filename_ob, NULL, -1, arena);
-
-error:
- Py_XDECREF(filename_ob);
- PyArena_Free(arena);
- return result;
-}
-
-PyCodeObject *
-PyPegen_CodeObjectFromFileObject(FILE *fp, PyObject *filename_ob, int mode,
- const char *ps1, const char *ps2,
- PyCompilerFlags *flags, const char *enc, int *errcode)
-{
- PyArena *arena = PyArena_New();
- if (arena == NULL) {
- return NULL;
- }
-
- PyCodeObject *result = NULL;
-
- mod_ty res = PyPegen_ASTFromFileObject(fp, filename_ob, mode, enc, ps1, ps2,
- flags, errcode, arena);
- if (res == NULL) {
- goto error;
- }
-
- result = PyAST_CompileObject(res, filename_ob, NULL, -1, arena);
-
-error:
- PyArena_Free(arena);
- return result;
-}