[Python-checkins] python/dist/src/Python pythonrun.c,2.161.2.3,2.161.2.4
jhylton@users.sourceforge.net
jhylton@users.sourceforge.net
Fri, 23 Aug 2002 11:13:29 -0700
Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv19542/Python
Modified Files:
Tag: ast-branch
pythonrun.c
Log Message:
Replace many obsolete functions with #defines that call the right function.
There are so many variants of Flags, Ex, ExFlags, ExFlagsEx. (You can
hear the vikings singing.) All but the longest names are effectively
obsolete, so replace them with macros.
Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.161.2.3
retrieving revision 2.161.2.4
diff -C2 -d -r2.161.2.3 -r2.161.2.4
*** pythonrun.c 9 Jul 2002 13:22:01 -0000 2.161.2.3
--- pythonrun.c 23 Aug 2002 18:13:27 -0000 2.161.2.4
***************
*** 36,44 ****
static void initmain(void);
static void initsite(void);
! static PyObject *run_err_node(node *, char *, PyObject *, PyObject *,
PyCompilerFlags *);
! static PyObject *run_node(node *, char *, PyObject *, PyObject *,
PyCompilerFlags *);
! static PyObject *run_pyc_file(FILE *, char *, PyObject *, PyObject *,
PyCompilerFlags *);
static void err_input(perrdetail *);
--- 36,44 ----
static void initmain(void);
static void initsite(void);
! static PyObject *run_err_mod(mod_ty, const char *, PyObject *, PyObject *,
PyCompilerFlags *);
! static PyObject *run_mod(mod_ty, const char *, PyObject *, PyObject *,
PyCompilerFlags *);
! static PyObject *run_pyc_file(FILE *, const char *, PyObject *, PyObject *,
PyCompilerFlags *);
static void err_input(perrdetail *);
***************
*** 471,492 ****
int
- PyRun_AnyFile(FILE *fp, char *filename)
- {
- return PyRun_AnyFileExFlags(fp, filename, 0, NULL);
- }
-
- int
- PyRun_AnyFileFlags(FILE *fp, char *filename, PyCompilerFlags *flags)
- {
- return PyRun_AnyFileExFlags(fp, filename, 0, flags);
- }
-
- int
- PyRun_AnyFileEx(FILE *fp, char *filename, int closeit)
- {
- return PyRun_AnyFileExFlags(fp, filename, closeit, NULL);
- }
-
- int
PyRun_AnyFileExFlags(FILE *fp, char *filename, int closeit,
PyCompilerFlags *flags)
--- 471,474 ----
***************
*** 505,514 ****
int
- PyRun_InteractiveLoop(FILE *fp, char *filename)
- {
- return PyRun_InteractiveLoopFlags(fp, filename, NULL);
- }
-
- int
PyRun_InteractiveLoopFlags(FILE *fp, char *filename, PyCompilerFlags *flags)
{
--- 487,490 ----
***************
*** 545,554 ****
}
- int
- PyRun_InteractiveOne(FILE *fp, char *filename)
- {
- return PyRun_InteractiveOneFlags(fp, filename, NULL);
- }
-
/* compute parser flags based on compiler flags */
#if 0 /* future keyword */
--- 521,524 ----
***************
*** 564,568 ****
{
PyObject *m, *d, *v, *w;
! node *n;
perrdetail err;
char *ps1 = "", *ps2 = "";
--- 534,538 ----
{
PyObject *m, *d, *v, *w;
! mod_ty mod;
perrdetail err;
char *ps1 = "", *ps2 = "";
***************
*** 584,593 ****
ps2 = PyString_AsString(w);
}
! n = PyParser_ParseFileFlags(fp, filename, &_PyParser_Grammar,
! Py_single_input, ps1, ps2, &err,
! PARSER_FLAGS(flags));
Py_XDECREF(v);
Py_XDECREF(w);
! if (n == NULL) {
if (err.error == E_EOF) {
if (err.text)
--- 554,563 ----
ps2 = PyString_AsString(w);
}
! mod = PyParser_ASTFromFile(fp, filename,
! Py_single_input, ps1, ps2,
! PARSER_FLAGS(flags));
Py_XDECREF(v);
Py_XDECREF(w);
! if (mod == NULL) {
if (err.error == E_EOF) {
if (err.text)
***************
*** 603,607 ****
return -1;
d = PyModule_GetDict(m);
! v = run_node(n, filename, d, d, flags);
if (v == NULL) {
PyErr_Print();
--- 573,577 ----
return -1;
d = PyModule_GetDict(m);
! v = run_mod(mod, filename, d, d, flags);
if (v == NULL) {
PyErr_Print();
***************
*** 614,623 ****
}
- int
- PyRun_SimpleFile(FILE *fp, char *filename)
- {
- return PyRun_SimpleFileEx(fp, filename, 0);
- }
-
/* Check whether a file maybe a pyc file: Look at the extension,
the file type, and, if we may close it, at the first few bytes. */
--- 584,587 ----
***************
*** 668,677 ****
int
- PyRun_SimpleFileEx(FILE *fp, char *filename, int closeit)
- {
- return PyRun_SimpleFileExFlags(fp, filename, closeit, NULL);
- }
-
- int
PyRun_SimpleFileExFlags(FILE *fp, char *filename, int closeit,
PyCompilerFlags *flags)
--- 632,635 ----
***************
*** 712,721 ****
int
- PyRun_SimpleString(char *command)
- {
- return PyRun_SimpleStringFlags(command, NULL);
- }
-
- int
PyRun_SimpleStringFlags(char *command, PyCompilerFlags *flags)
{
--- 670,673 ----
***************
*** 1019,1060 ****
PyObject *
- PyRun_String(char *str, int start, PyObject *globals, PyObject *locals)
- {
- return run_err_node(PyParser_SimpleParseString(str, start),
- "<string>", globals, locals, NULL);
- }
-
- PyObject *
- PyRun_File(FILE *fp, char *filename, int start, PyObject *globals,
- PyObject *locals)
- {
- return PyRun_FileEx(fp, filename, start, globals, locals, 0);
- }
-
- PyObject *
- PyRun_FileEx(FILE *fp, char *filename, int start, PyObject *globals,
- PyObject *locals, int closeit)
- {
- node *n = PyParser_SimpleParseFile(fp, filename, start);
- if (closeit)
- fclose(fp);
- return run_err_node(n, filename, globals, locals, NULL);
- }
-
- PyObject *
PyRun_StringFlags(char *str, int start, PyObject *globals, PyObject *locals,
PyCompilerFlags *flags)
{
! return run_err_node(PyParser_SimpleParseStringFlags(
! str, start, PARSER_FLAGS(flags)),
! "<string>", globals, locals, flags);
! }
!
! PyObject *
! PyRun_FileFlags(FILE *fp, char *filename, int start, PyObject *globals,
! PyObject *locals, PyCompilerFlags *flags)
! {
! return PyRun_FileExFlags(fp, filename, start, globals, locals, 0,
! flags);
}
--- 971,980 ----
PyObject *
PyRun_StringFlags(char *str, int start, PyObject *globals, PyObject *locals,
PyCompilerFlags *flags)
{
! mod_ty mod = PyParser_ASTFromString(str, "<string>", start,
! PARSER_FLAGS(flags));
! return run_err_mod(mod, "<string>", globals, locals, flags);
}
***************
*** 1063,1090 ****
PyObject *locals, int closeit, PyCompilerFlags *flags)
{
! node *n = PyParser_SimpleParseFileFlags(fp, filename, start,
! PARSER_FLAGS(flags));
if (closeit)
fclose(fp);
! return run_err_node(n, filename, globals, locals, flags);
}
static PyObject *
! run_err_node(node *n, char *filename, PyObject *globals, PyObject *locals,
! PyCompilerFlags *flags)
{
! if (n == NULL)
return NULL;
! return run_node(n, filename, globals, locals, flags);
}
static PyObject *
! run_node(node *n, char *filename, PyObject *globals, PyObject *locals,
PyCompilerFlags *flags)
{
PyCodeObject *co;
PyObject *v;
! co = PyNode_CompileFlags(n, filename, flags);
! PyNode_Free(n);
if (co == NULL)
return NULL;
--- 983,1009 ----
PyObject *locals, int closeit, PyCompilerFlags *flags)
{
! mod_ty mod = PyParser_ASTFromFile(fp, filename, start, 0, 0,
! PARSER_FLAGS(flags));
if (closeit)
fclose(fp);
! return run_err_mod(mod, filename, globals, locals, flags);
}
static PyObject *
! run_err_mod(mod_ty mod, const char *filename, PyObject *globals,
! PyObject *locals, PyCompilerFlags *flags)
{
! if (mod == NULL)
return NULL;
! return run_mod(mod, filename, globals, locals, flags);
}
static PyObject *
! run_mod(mod_ty mod, const char *filename, PyObject *globals, PyObject *locals,
PyCompilerFlags *flags)
{
PyCodeObject *co;
PyObject *v;
! co = PyAST_Compile(mod, filename, flags);
if (co == NULL)
return NULL;
***************
*** 1095,1100 ****
static PyObject *
! run_pyc_file(FILE *fp, char *filename, PyObject *globals, PyObject *locals,
! PyCompilerFlags *flags)
{
PyCodeObject *co;
--- 1014,1019 ----
static PyObject *
! run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
! PyObject *locals, PyCompilerFlags *flags)
{
PyCodeObject *co;
***************
*** 1127,1146 ****
PyObject *
- Py_CompileString(char *str, char *filename, int start)
- {
- return Py_CompileStringFlags(str, filename, start, NULL);
- }
-
- PyObject *
Py_CompileStringFlags(char *str, char *filename, int start,
PyCompilerFlags *flags)
{
! node *n;
PyCodeObject *co;
! n = PyParser_SimpleParseStringFlags(str, start, PARSER_FLAGS(flags));
! if (n == NULL)
return NULL;
! co = PyNode_CompileFlags(n, filename, flags);
! PyNode_Free(n);
return (PyObject *)co;
}
--- 1046,1059 ----
PyObject *
Py_CompileStringFlags(char *str, char *filename, int start,
PyCompilerFlags *flags)
{
! mod_ty mod;
PyCodeObject *co;
! mod = PyParser_ASTFromString(str, filename, start,
! PARSER_FLAGS(flags));
! if (mod == NULL)
return NULL;
! co = PyAST_Compile(mod, filename, flags);
return (PyObject *)co;
}
***************
*** 1149,1159 ****
Py_SymtableString(char *str, char *filename, int start)
{
! node *n;
struct symtable *st;
! n = PyParser_SimpleParseString(str, start);
! if (n == NULL)
return NULL;
! st = PyNode_CompileSymtable(n, filename);
! PyNode_Free(n);
return st;
}
--- 1062,1073 ----
Py_SymtableString(char *str, char *filename, int start)
{
! /* XXX flags? */
!
! mod_ty mod;
struct symtable *st;
! mod = PyParser_ASTFromString(str, filename, start, 0);
! if (mod == NULL)
return NULL;
! st = PySymtable_Build(mod, filename, 0);
return st;
}