Commit 47a88fdf authored by Neal Norwitz's avatar Neal Norwitz

Get rid of run_err_mod(). It was only used in two places.

One place it wasn't necessary since mod was already checked.
Inline the check that mod != NULL for the other use.
parent e8c701af
...@@ -36,8 +36,6 @@ extern grammar _PyParser_Grammar; /* From graminit.c */ ...@@ -36,8 +36,6 @@ extern grammar _PyParser_Grammar; /* From graminit.c */
/* Forward */ /* Forward */
static void initmain(void); static void initmain(void);
static void initsite(void); static void initsite(void);
static PyObject *run_err_mod(mod_ty, const char *, PyObject *, PyObject *,
PyCompilerFlags *, PyArena *arena);
static PyObject *run_mod(mod_ty, const char *, PyObject *, PyObject *, static PyObject *run_mod(mod_ty, const char *, PyObject *, PyObject *,
PyCompilerFlags *, PyArena *); PyCompilerFlags *, PyArena *);
static PyObject *run_pyc_file(FILE *, const char *, PyObject *, PyObject *, static PyObject *run_pyc_file(FILE *, const char *, PyObject *, PyObject *,
...@@ -1159,11 +1157,12 @@ PyObject * ...@@ -1159,11 +1157,12 @@ PyObject *
PyRun_StringFlags(const char *str, int start, PyObject *globals, PyRun_StringFlags(const char *str, int start, PyObject *globals,
PyObject *locals, PyCompilerFlags *flags) PyObject *locals, PyCompilerFlags *flags)
{ {
PyObject *ret; PyObject *ret = NULL;
PyArena *arena = PyArena_New(); PyArena *arena = PyArena_New();
mod_ty mod = PyParser_ASTFromString(str, "<string>", start, flags, mod_ty mod = PyParser_ASTFromString(str, "<string>", start, flags,
arena); arena);
ret = run_err_mod(mod, "<string>", globals, locals, flags, arena); if (mod != NULL)
ret = run_mod(mod, "<string>", globals, locals, flags, arena);
PyArena_Free(arena); PyArena_Free(arena);
return ret; return ret;
} }
...@@ -1182,20 +1181,11 @@ PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals, ...@@ -1182,20 +1181,11 @@ PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals,
} }
if (closeit) if (closeit)
fclose(fp); fclose(fp);
ret = run_err_mod(mod, filename, globals, locals, flags, arena); ret = run_mod(mod, filename, globals, locals, flags, arena);
PyArena_Free(arena); PyArena_Free(arena);
return ret; return ret;
} }
static PyObject *
run_err_mod(mod_ty mod, const char *filename, PyObject *globals,
PyObject *locals, PyCompilerFlags *flags, PyArena *arena)
{
if (mod == NULL)
return NULL;
return run_mod(mod, filename, globals, locals, flags, arena);
}
static PyObject * static PyObject *
run_mod(mod_ty mod, const char *filename, PyObject *globals, PyObject *locals, run_mod(mod_ty mod, const char *filename, PyObject *globals, PyObject *locals,
PyCompilerFlags *flags, PyArena *arena) PyCompilerFlags *flags, PyArena *arena)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment