diff options
author | Guido van Rossum <guido@python.org> | 1997-05-07 17:46:13 +0000 |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 1997-05-07 17:46:13 +0000 |
commit | 98e84593f90bb1cb257b3d0c8a34729364338215 (patch) | |
tree | df59b42a6464d2c1b4d5fc768a4d7c11b5ade6d9 /Python/pythonrun.c | |
parent | 021aea5f0010ad14ce896d1a3d507b56ca3c5694 (diff) | |
download | cpython-98e84593f90bb1cb257b3d0c8a34729364338215.tar.gz |
Instead of importing graminit.h whenever one of the three grammar 'root'
symbols is needed, define these in Python.h with a Py_ prefix.
Diffstat (limited to 'Python/pythonrun.c')
-rw-r--r-- | Python/pythonrun.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 8bb7565fb6..138bc3f82e 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -36,7 +36,6 @@ PERFORMANCE OF THIS SOFTWARE. #include "grammar.h" #include "node.h" #include "parsetok.h" -#include "graminit.h" #undef argument /* Avoid conflict on Mac */ #include "errcode.h" #include "compile.h" @@ -237,7 +236,7 @@ PyRun_InteractiveOne(fp, filename) } Py_BEGIN_ALLOW_THREADS n = PyParser_ParseFile(fp, filename, &_PyParser_Grammar, - single_input, ps1, ps2, &err); + Py_single_input, ps1, ps2, &err); Py_END_ALLOW_THREADS Py_XDECREF(v); Py_XDECREF(w); @@ -296,7 +295,7 @@ PyRun_SimpleFile(fp, filename) Py_OptimizeFlag = 1; v = run_pyc_file(fp, filename, d, d); } else { - v = PyRun_File(fp, filename, file_input, d, d); + v = PyRun_File(fp, filename, Py_file_input, d, d); } if (v == NULL) { PyErr_Print(); @@ -316,7 +315,7 @@ PyRun_SimpleString(command) if (m == NULL) return -1; d = PyModule_GetDict(m); - v = PyRun_String(command, file_input, d, d); + v = PyRun_String(command, Py_file_input, d, d); if (v == NULL) { PyErr_Print(); return -1; |