Merged revisions 67066 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67066 | benjamin.peterson | 2008-10-30 21:16:05 -0500 (Thu, 30 Oct 2008) | 5 lines
make sure the parser flags and passed onto the compiler
This fixes "from __future__ import unicode_literals" in an exec statment
See #4225
........
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 2a61eec..652b07c 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -26,12 +26,20 @@
*/
#include "Python.h" /* general Python API */
+#include "Python-ast.h" /* mod_ty */
#include "graminit.h" /* symbols defined in the grammar */
#include "node.h" /* internal parser structure */
#include "errcode.h" /* error codes for PyNode_*() */
#include "token.h" /* token definitions */
+#include "grammar.h"
+#include "parsetok.h"
/* ISTERMINAL() / ISNONTERMINAL() */
-#include "compile.h" /* PyNode_Compile() */
+#include "compile.h"
+#undef Yield
+#include "ast.h"
+#include "pyarena.h"
+
+extern grammar _PyParser_Grammar; /* From graminit.c */
#ifdef lint
#include <note.h>
@@ -156,6 +164,7 @@
PyObject_HEAD /* standard object header */
node* st_node; /* the node* returned by the parser */
int st_type; /* EXPR or SUITE ? */
+ PyCompilerFlags st_flags; /* Parser and compiler flags */
} PyST_Object;
@@ -287,6 +296,7 @@
if (o != 0) {
o->st_node = st;
o->st_type = type;
+ o->st_flags.cf_flags = 0;
}
else {
PyNode_Free(st);
@@ -405,6 +415,8 @@
parser_compilest(PyST_Object *self, PyObject *args, PyObject *kw)
{
PyObject* res = 0;
+ PyArena* arena;
+ mod_ty mod;
char* str = "<syntax-tree>";
int ok;
@@ -417,8 +429,16 @@
ok = PyArg_ParseTupleAndKeywords(args, kw, "|s:compile", &keywords[1],
&str);
- if (ok)
- res = (PyObject *)PyNode_Compile(self->st_node, str);
+ if (ok) {
+ arena = PyArena_New();
+ if (arena) {
+ mod = PyAST_FromNode(self->st_node, &(self->st_flags), str, arena);
+ if (mod) {
+ res = (PyObject *)PyAST_Compile(mod, str, &(self->st_flags), arena);
+ }
+ PyArena_Free(arena);
+ }
+ }
return (res);
}
@@ -500,16 +520,25 @@
{
char* string = 0;
PyObject* res = 0;
+ int flags = 0;
+ perrdetail err;
static char *keywords[] = {"source", NULL};
if (PyArg_ParseTupleAndKeywords(args, kw, argspec, keywords, &string)) {
- node* n = PyParser_SimpleParseString(string,
- (type == PyST_EXPR)
- ? eval_input : file_input);
+ node* n = PyParser_ParseStringFlagsFilenameEx(string, NULL,
+ &_PyParser_Grammar,
+ (type == PyST_EXPR)
+ ? eval_input : file_input,
+ &err, &flags);
- if (n)
+ if (n) {
res = parser_newstobject(n, type);
+ if (res)
+ ((PyST_Object *)res)->st_flags.cf_flags = flags & PyCF_MASK;
+ }
+ else
+ PyParser_SetError(&err);
}
return (res);
}