mirror of
https://github.com/python/cpython.git
synced 2025-07-09 20:35:26 +00:00
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:
parent
8813b58ffa
commit
b05a5c7698
7 changed files with 39 additions and 21 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue