Instead of importing graminit.h whenever one of the three grammar 'root'

symbols is needed, define these in Python.h with a Py_ prefix.
This commit is contained in:
Guido van Rossum 1997-05-07 17:46:13 +00:00
parent 8813b58ffa
commit b05a5c7698
7 changed files with 39 additions and 21 deletions

View file

@ -43,7 +43,6 @@ PERFORMANCE OF THIS SOFTWARE.
#include "frameobject.h"
#include "eval.h"
#include "opcode.h"
#include "graminit.h"
#include <ctype.h>
@ -2637,7 +2636,8 @@ exec_statement(f, prog, globals, locals)
if (PyFile_Check(prog)) {
FILE *fp = PyFile_AsFile(prog);
char *name = PyString_AsString(PyFile_Name(prog));
if (PyRun_File(fp, name, file_input, globals, locals) == NULL)
if (PyRun_File(fp, name, Py_file_input,
globals, locals) == NULL)
return -1;
return 0;
}
@ -2647,7 +2647,7 @@ exec_statement(f, prog, globals, locals)
"embedded '\\0' in exec string");
return -1;
}
v = PyRun_String(s, file_input, globals, locals);
v = PyRun_String(s, Py_file_input, globals, locals);
if (v == NULL)
return -1;
Py_DECREF(v);