Patch #2477: Added from __future__ import unicode_literals
The new PyParser_*Ex() functions are based on Neal's suggestion and initial patch. The new __future__ feature makes all '' and r'' unicode strings. b'' and br'' stay (byte) strings.
This commit is contained in:
parent
0cb3e86c47
commit
3c60833e1e
|
@ -49,6 +49,7 @@ typedef struct {
|
||||||
#define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */
|
#define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */
|
||||||
#define CO_FUTURE_WITH_STATEMENT 0x8000
|
#define CO_FUTURE_WITH_STATEMENT 0x8000
|
||||||
#define CO_FUTURE_PRINT_FUNCTION 0x10000
|
#define CO_FUTURE_PRINT_FUNCTION 0x10000
|
||||||
|
#define CO_FUTURE_UNICODE_LITERALS 0x20000
|
||||||
|
|
||||||
/* This should be defined if a future statement modifies the syntax.
|
/* This should be defined if a future statement modifies the syntax.
|
||||||
For example, when a keyword is added.
|
For example, when a keyword is added.
|
||||||
|
|
|
@ -25,6 +25,7 @@ typedef struct {
|
||||||
#define FUTURE_ABSOLUTE_IMPORT "absolute_import"
|
#define FUTURE_ABSOLUTE_IMPORT "absolute_import"
|
||||||
#define FUTURE_WITH_STATEMENT "with_statement"
|
#define FUTURE_WITH_STATEMENT "with_statement"
|
||||||
#define FUTURE_PRINT_FUNCTION "print_function"
|
#define FUTURE_PRINT_FUNCTION "print_function"
|
||||||
|
#define FUTURE_UNICODE_LITERALS "unicode_literals"
|
||||||
|
|
||||||
|
|
||||||
struct _mod; /* Declare the existence of this type */
|
struct _mod; /* Declare the existence of this type */
|
||||||
|
|
|
@ -28,6 +28,7 @@ typedef struct {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PyPARSE_PRINT_IS_FUNCTION 0x0004
|
#define PyPARSE_PRINT_IS_FUNCTION 0x0004
|
||||||
|
#define PyPARSE_UNICODE_LITERALS 0x0008
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -41,11 +42,18 @@ PyAPI_FUNC(node *) PyParser_ParseStringFlags(const char *, grammar *, int,
|
||||||
PyAPI_FUNC(node *) PyParser_ParseFileFlags(FILE *, const char *, grammar *,
|
PyAPI_FUNC(node *) PyParser_ParseFileFlags(FILE *, const char *, grammar *,
|
||||||
int, char *, char *,
|
int, char *, char *,
|
||||||
perrdetail *, int);
|
perrdetail *, int);
|
||||||
|
PyAPI_FUNC(node *) PyParser_ParseFileFlagsEx(FILE *, const char *, grammar *,
|
||||||
|
int, char *, char *,
|
||||||
|
perrdetail *, int *);
|
||||||
|
|
||||||
PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(const char *,
|
PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(const char *,
|
||||||
const char *,
|
const char *,
|
||||||
grammar *, int,
|
grammar *, int,
|
||||||
perrdetail *, int);
|
perrdetail *, int);
|
||||||
|
PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilenameEx(const char *,
|
||||||
|
const char *,
|
||||||
|
grammar *, int,
|
||||||
|
perrdetail *, int *);
|
||||||
|
|
||||||
/* Note that he following function is defined in pythonrun.c not parsetok.c. */
|
/* Note that he following function is defined in pythonrun.c not parsetok.c. */
|
||||||
PyAPI_FUNC(void) PyParser_SetError(perrdetail *);
|
PyAPI_FUNC(void) PyParser_SetError(perrdetail *);
|
||||||
|
|
|
@ -8,7 +8,8 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
|
#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
|
||||||
CO_FUTURE_WITH_STATEMENT|CO_FUTURE_PRINT_FUNCTION)
|
CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \
|
||||||
|
CO_FUTURE_UNICODE_LITERALS)
|
||||||
#define PyCF_MASK_OBSOLETE (CO_NESTED)
|
#define PyCF_MASK_OBSOLETE (CO_NESTED)
|
||||||
#define PyCF_SOURCE_IS_UTF8 0x0100
|
#define PyCF_SOURCE_IS_UTF8 0x0100
|
||||||
#define PyCF_DONT_IMPLY_DEDENT 0x0200
|
#define PyCF_DONT_IMPLY_DEDENT 0x0200
|
||||||
|
|
|
@ -54,6 +54,7 @@ all_feature_names = [
|
||||||
"absolute_import",
|
"absolute_import",
|
||||||
"with_statement",
|
"with_statement",
|
||||||
"print_function",
|
"print_function",
|
||||||
|
"unicode_literals",
|
||||||
]
|
]
|
||||||
|
|
||||||
__all__ = ["all_feature_names"] + all_feature_names
|
__all__ = ["all_feature_names"] + all_feature_names
|
||||||
|
@ -68,6 +69,7 @@ CO_FUTURE_DIVISION = 0x2000 # division
|
||||||
CO_FUTURE_ABSOLUTE_IMPORT = 0x4000 # perform absolute imports by default
|
CO_FUTURE_ABSOLUTE_IMPORT = 0x4000 # perform absolute imports by default
|
||||||
CO_FUTURE_WITH_STATEMENT = 0x8000 # with statement
|
CO_FUTURE_WITH_STATEMENT = 0x8000 # with statement
|
||||||
CO_FUTURE_PRINT_FUNCTION = 0x10000 # print function
|
CO_FUTURE_PRINT_FUNCTION = 0x10000 # print function
|
||||||
|
CO_FUTURE_UNICODE_LITERALS = 0x20000 # unicode string literals
|
||||||
|
|
||||||
class _Feature:
|
class _Feature:
|
||||||
def __init__(self, optionalRelease, mandatoryRelease, compiler_flag):
|
def __init__(self, optionalRelease, mandatoryRelease, compiler_flag):
|
||||||
|
@ -120,3 +122,7 @@ with_statement = _Feature((2, 5, 0, "alpha", 1),
|
||||||
print_function = _Feature((2, 6, 0, "alpha", 2),
|
print_function = _Feature((2, 6, 0, "alpha", 2),
|
||||||
(3, 0, 0, "alpha", 0),
|
(3, 0, 0, "alpha", 0),
|
||||||
CO_FUTURE_PRINT_FUNCTION)
|
CO_FUTURE_PRINT_FUNCTION)
|
||||||
|
|
||||||
|
unicode_literals = _Feature((2, 6, 0, "alpha", 2),
|
||||||
|
(3, 0, 0, "alpha", 0),
|
||||||
|
CO_FUTURE_UNICODE_LITERALS)
|
||||||
|
|
|
@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 2?
|
||||||
Core and builtins
|
Core and builtins
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
- Patch #2477: Added from __future__ import unicode_literals
|
||||||
|
|
||||||
- Added backport of bytearray type.
|
- Added backport of bytearray type.
|
||||||
|
|
||||||
- Issue #2355: add Py3k warning for buffer().
|
- Issue #2355: add Py3k warning for buffer().
|
||||||
|
@ -186,6 +188,12 @@ Build
|
||||||
|
|
||||||
- Patch #2284: Add -x64 option to rt.bat.
|
- Patch #2284: Add -x64 option to rt.bat.
|
||||||
|
|
||||||
|
C API
|
||||||
|
-----
|
||||||
|
|
||||||
|
- Patch #2477: Added PyParser_ParseFileFlagsEx() and
|
||||||
|
PyParser_ParseStringFlagsFilenameEx()
|
||||||
|
|
||||||
What's New in Python 2.6 alpha 1?
|
What's New in Python 2.6 alpha 1?
|
||||||
=================================
|
=================================
|
||||||
|
|
||||||
|
|
|
@ -202,14 +202,18 @@ future_hack(parser_state *ps)
|
||||||
|
|
||||||
for (i = 0; i < NCH(ch); i += 2) {
|
for (i = 0; i < NCH(ch); i += 2) {
|
||||||
cch = CHILD(ch, i);
|
cch = CHILD(ch, i);
|
||||||
if (NCH(cch) >= 1 && TYPE(CHILD(cch, 0)) == NAME &&
|
if (NCH(cch) >= 1 && TYPE(CHILD(cch, 0)) == NAME) {
|
||||||
strcmp(STR(CHILD(cch, 0)), "with_statement") == 0) {
|
char *str_ch = STR(CHILD(cch, 0));
|
||||||
ps->p_flags |= CO_FUTURE_WITH_STATEMENT;
|
if (strcmp(str_ch, FUTURE_WITH_STATEMENT) == 0) {
|
||||||
break;
|
ps->p_flags |= CO_FUTURE_WITH_STATEMENT;
|
||||||
} else if (NCH(cch) >= 1 && TYPE(CHILD(cch, 0)) == NAME &&
|
break;
|
||||||
strcmp(STR(CHILD(cch, 0)), "print_function") == 0) {
|
} else if (strcmp(str_ch, FUTURE_PRINT_FUNCTION) == 0) {
|
||||||
ps->p_flags |= CO_FUTURE_PRINT_FUNCTION;
|
ps->p_flags |= CO_FUTURE_PRINT_FUNCTION;
|
||||||
break;
|
break;
|
||||||
|
} else if (strcmp(str_ch, FUTURE_UNICODE_LITERALS) == 0) {
|
||||||
|
ps->p_flags |= CO_FUTURE_UNICODE_LITERALS;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ int Py_TabcheckFlag;
|
||||||
|
|
||||||
|
|
||||||
/* Forward */
|
/* Forward */
|
||||||
static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int);
|
static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int *);
|
||||||
static void initerr(perrdetail *err_ret, const char* filename);
|
static void initerr(perrdetail *err_ret, const char* filename);
|
||||||
|
|
||||||
/* Parse input coming from a string. Return error code, print some errors. */
|
/* Parse input coming from a string. Return error code, print some errors. */
|
||||||
|
@ -36,6 +36,16 @@ node *
|
||||||
PyParser_ParseStringFlagsFilename(const char *s, const char *filename,
|
PyParser_ParseStringFlagsFilename(const char *s, const char *filename,
|
||||||
grammar *g, int start,
|
grammar *g, int start,
|
||||||
perrdetail *err_ret, int flags)
|
perrdetail *err_ret, int flags)
|
||||||
|
{
|
||||||
|
int iflags = flags;
|
||||||
|
return PyParser_ParseStringFlagsFilenameEx(s, filename, g, start,
|
||||||
|
err_ret, &iflags);
|
||||||
|
}
|
||||||
|
|
||||||
|
node *
|
||||||
|
PyParser_ParseStringFlagsFilenameEx(const char *s, const char *filename,
|
||||||
|
grammar *g, int start,
|
||||||
|
perrdetail *err_ret, int *flags)
|
||||||
{
|
{
|
||||||
struct tok_state *tok;
|
struct tok_state *tok;
|
||||||
|
|
||||||
|
@ -69,6 +79,14 @@ PyParser_ParseFile(FILE *fp, const char *filename, grammar *g, int start,
|
||||||
node *
|
node *
|
||||||
PyParser_ParseFileFlags(FILE *fp, const char *filename, grammar *g, int start,
|
PyParser_ParseFileFlags(FILE *fp, const char *filename, grammar *g, int start,
|
||||||
char *ps1, char *ps2, perrdetail *err_ret, int flags)
|
char *ps1, char *ps2, perrdetail *err_ret, int flags)
|
||||||
|
{
|
||||||
|
int iflags = flags;
|
||||||
|
return PyParser_ParseFileFlagsEx(fp, filename, g, start, ps1, ps2, err_ret, &iflags);
|
||||||
|
}
|
||||||
|
|
||||||
|
node *
|
||||||
|
PyParser_ParseFileFlagsEx(FILE *fp, const char *filename, grammar *g, int start,
|
||||||
|
char *ps1, char *ps2, perrdetail *err_ret, int *flags)
|
||||||
{
|
{
|
||||||
struct tok_state *tok;
|
struct tok_state *tok;
|
||||||
|
|
||||||
|
@ -85,7 +103,6 @@ PyParser_ParseFileFlags(FILE *fp, const char *filename, grammar *g, int start,
|
||||||
tok->alterror++;
|
tok->alterror++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return parsetok(tok, g, start, err_ret, flags);
|
return parsetok(tok, g, start, err_ret, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -110,7 +127,7 @@ warn(const char *msg, const char *filename, int lineno)
|
||||||
|
|
||||||
static node *
|
static node *
|
||||||
parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
|
parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
|
||||||
int flags)
|
int *flags)
|
||||||
{
|
{
|
||||||
parser_state *ps;
|
parser_state *ps;
|
||||||
node *n;
|
node *n;
|
||||||
|
@ -123,8 +140,13 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
#ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD
|
#ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD
|
||||||
if (flags & PyPARSE_PRINT_IS_FUNCTION)
|
if (*flags & PyPARSE_PRINT_IS_FUNCTION) {
|
||||||
ps->p_flags |= CO_FUTURE_PRINT_FUNCTION;
|
ps->p_flags |= CO_FUTURE_PRINT_FUNCTION;
|
||||||
|
}
|
||||||
|
if (*flags & PyPARSE_UNICODE_LITERALS) {
|
||||||
|
ps->p_flags |= CO_FUTURE_UNICODE_LITERALS;
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
|
@ -147,7 +169,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
|
||||||
except if a certain flag is given --
|
except if a certain flag is given --
|
||||||
codeop.py uses this. */
|
codeop.py uses this. */
|
||||||
if (tok->indent &&
|
if (tok->indent &&
|
||||||
!(flags & PyPARSE_DONT_IMPLY_DEDENT))
|
!(*flags & PyPARSE_DONT_IMPLY_DEDENT))
|
||||||
{
|
{
|
||||||
tok->pendin = -tok->indent;
|
tok->pendin = -tok->indent;
|
||||||
tok->indent = 0;
|
tok->indent = 0;
|
||||||
|
@ -191,6 +213,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
|
||||||
else
|
else
|
||||||
n = NULL;
|
n = NULL;
|
||||||
|
|
||||||
|
*flags = ps->p_flags;
|
||||||
PyParser_Delete(ps);
|
PyParser_Delete(ps);
|
||||||
|
|
||||||
if (n == NULL) {
|
if (n == NULL) {
|
||||||
|
|
25
Python/ast.c
25
Python/ast.c
|
@ -18,6 +18,7 @@
|
||||||
/* Data structure used internally */
|
/* Data structure used internally */
|
||||||
struct compiling {
|
struct compiling {
|
||||||
char *c_encoding; /* source encoding */
|
char *c_encoding; /* source encoding */
|
||||||
|
int c_future_unicode; /* __future__ unicode literals flag */
|
||||||
PyArena *c_arena; /* arena for allocating memeory */
|
PyArena *c_arena; /* arena for allocating memeory */
|
||||||
const char *c_filename; /* filename */
|
const char *c_filename; /* filename */
|
||||||
};
|
};
|
||||||
|
@ -36,7 +37,7 @@ static expr_ty ast_for_testlist_gexp(struct compiling *, const node *);
|
||||||
static expr_ty ast_for_call(struct compiling *, const node *, expr_ty);
|
static expr_ty ast_for_call(struct compiling *, const node *, expr_ty);
|
||||||
|
|
||||||
static PyObject *parsenumber(const char *);
|
static PyObject *parsenumber(const char *);
|
||||||
static PyObject *parsestr(const char *s, const char *encoding);
|
static PyObject *parsestr(struct compiling *, const char *);
|
||||||
static PyObject *parsestrplus(struct compiling *, const node *n);
|
static PyObject *parsestrplus(struct compiling *, const node *n);
|
||||||
|
|
||||||
#ifndef LINENO
|
#ifndef LINENO
|
||||||
|
@ -198,6 +199,7 @@ PyAST_FromNode(const node *n, PyCompilerFlags *flags, const char *filename,
|
||||||
} else {
|
} else {
|
||||||
c.c_encoding = NULL;
|
c.c_encoding = NULL;
|
||||||
}
|
}
|
||||||
|
c.c_future_unicode = flags && flags->cf_flags & CO_FUTURE_UNICODE_LITERALS;
|
||||||
c.c_arena = arena;
|
c.c_arena = arena;
|
||||||
c.c_filename = filename;
|
c.c_filename = filename;
|
||||||
|
|
||||||
|
@ -3247,13 +3249,13 @@ decode_unicode(const char *s, size_t len, int rawmode, const char *encoding)
|
||||||
* parsestr parses it, and returns the decoded Python string object.
|
* parsestr parses it, and returns the decoded Python string object.
|
||||||
*/
|
*/
|
||||||
static PyObject *
|
static PyObject *
|
||||||
parsestr(const char *s, const char *encoding)
|
parsestr(struct compiling *c, const char *s)
|
||||||
{
|
{
|
||||||
size_t len;
|
size_t len;
|
||||||
int quote = Py_CHARMASK(*s);
|
int quote = Py_CHARMASK(*s);
|
||||||
int rawmode = 0;
|
int rawmode = 0;
|
||||||
int need_encoding;
|
int need_encoding;
|
||||||
int unicode = 0;
|
int unicode = c->c_future_unicode;
|
||||||
|
|
||||||
if (isalpha(quote) || quote == '_') {
|
if (isalpha(quote) || quote == '_') {
|
||||||
if (quote == 'u' || quote == 'U') {
|
if (quote == 'u' || quote == 'U') {
|
||||||
|
@ -3262,6 +3264,7 @@ parsestr(const char *s, const char *encoding)
|
||||||
}
|
}
|
||||||
if (quote == 'b' || quote == 'B') {
|
if (quote == 'b' || quote == 'B') {
|
||||||
quote = *++s;
|
quote = *++s;
|
||||||
|
unicode = 0;
|
||||||
}
|
}
|
||||||
if (quote == 'r' || quote == 'R') {
|
if (quote == 'r' || quote == 'R') {
|
||||||
quote = *++s;
|
quote = *++s;
|
||||||
|
@ -3293,12 +3296,12 @@ parsestr(const char *s, const char *encoding)
|
||||||
}
|
}
|
||||||
#ifdef Py_USING_UNICODE
|
#ifdef Py_USING_UNICODE
|
||||||
if (unicode || Py_UnicodeFlag) {
|
if (unicode || Py_UnicodeFlag) {
|
||||||
return decode_unicode(s, len, rawmode, encoding);
|
return decode_unicode(s, len, rawmode, c->c_encoding);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
need_encoding = (encoding != NULL &&
|
need_encoding = (c->c_encoding != NULL &&
|
||||||
strcmp(encoding, "utf-8") != 0 &&
|
strcmp(c->c_encoding, "utf-8") != 0 &&
|
||||||
strcmp(encoding, "iso-8859-1") != 0);
|
strcmp(c->c_encoding, "iso-8859-1") != 0);
|
||||||
if (rawmode || strchr(s, '\\') == NULL) {
|
if (rawmode || strchr(s, '\\') == NULL) {
|
||||||
if (need_encoding) {
|
if (need_encoding) {
|
||||||
#ifndef Py_USING_UNICODE
|
#ifndef Py_USING_UNICODE
|
||||||
|
@ -3310,7 +3313,7 @@ parsestr(const char *s, const char *encoding)
|
||||||
PyObject *v, *u = PyUnicode_DecodeUTF8(s, len, NULL);
|
PyObject *v, *u = PyUnicode_DecodeUTF8(s, len, NULL);
|
||||||
if (u == NULL)
|
if (u == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
v = PyUnicode_AsEncodedString(u, encoding, NULL);
|
v = PyUnicode_AsEncodedString(u, c->c_encoding, NULL);
|
||||||
Py_DECREF(u);
|
Py_DECREF(u);
|
||||||
return v;
|
return v;
|
||||||
#endif
|
#endif
|
||||||
|
@ -3320,7 +3323,7 @@ parsestr(const char *s, const char *encoding)
|
||||||
}
|
}
|
||||||
|
|
||||||
return PyString_DecodeEscape(s, len, NULL, unicode,
|
return PyString_DecodeEscape(s, len, NULL, unicode,
|
||||||
need_encoding ? encoding : NULL);
|
need_encoding ? c->c_encoding : NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Build a Python string object out of a STRING atom. This takes care of
|
/* Build a Python string object out of a STRING atom. This takes care of
|
||||||
|
@ -3333,11 +3336,11 @@ parsestrplus(struct compiling *c, const node *n)
|
||||||
PyObject *v;
|
PyObject *v;
|
||||||
int i;
|
int i;
|
||||||
REQ(CHILD(n, 0), STRING);
|
REQ(CHILD(n, 0), STRING);
|
||||||
if ((v = parsestr(STR(CHILD(n, 0)), c->c_encoding)) != NULL) {
|
if ((v = parsestr(c, STR(CHILD(n, 0)))) != NULL) {
|
||||||
/* String literal concatenation */
|
/* String literal concatenation */
|
||||||
for (i = 1; i < NCH(n); i++) {
|
for (i = 1; i < NCH(n); i++) {
|
||||||
PyObject *s;
|
PyObject *s;
|
||||||
s = parsestr(STR(CHILD(n, i)), c->c_encoding);
|
s = parsestr(c, STR(CHILD(n, i)));
|
||||||
if (s == NULL)
|
if (s == NULL)
|
||||||
goto onError;
|
goto onError;
|
||||||
if (PyString_Check(v) && PyString_Check(s)) {
|
if (PyString_Check(v) && PyString_Check(s)) {
|
||||||
|
|
|
@ -35,6 +35,8 @@ future_check_features(PyFutureFeatures *ff, stmt_ty s, const char *filename)
|
||||||
ff->ff_features |= CO_FUTURE_WITH_STATEMENT;
|
ff->ff_features |= CO_FUTURE_WITH_STATEMENT;
|
||||||
} else if (strcmp(feature, FUTURE_PRINT_FUNCTION) == 0) {
|
} else if (strcmp(feature, FUTURE_PRINT_FUNCTION) == 0) {
|
||||||
ff->ff_features |= CO_FUTURE_PRINT_FUNCTION;
|
ff->ff_features |= CO_FUTURE_PRINT_FUNCTION;
|
||||||
|
} else if (strcmp(feature, FUTURE_UNICODE_LITERALS) == 0) {
|
||||||
|
ff->ff_features |= CO_FUTURE_UNICODE_LITERALS;
|
||||||
} else if (strcmp(feature, "braces") == 0) {
|
} else if (strcmp(feature, "braces") == 0) {
|
||||||
PyErr_SetString(PyExc_SyntaxError,
|
PyErr_SetString(PyExc_SyntaxError,
|
||||||
"not a chance");
|
"not a chance");
|
||||||
|
|
|
@ -818,11 +818,12 @@ parse_source_module(const char *pathname, FILE *fp)
|
||||||
{
|
{
|
||||||
PyCodeObject *co = NULL;
|
PyCodeObject *co = NULL;
|
||||||
mod_ty mod;
|
mod_ty mod;
|
||||||
|
PyCompilerFlags flags;
|
||||||
PyArena *arena = PyArena_New();
|
PyArena *arena = PyArena_New();
|
||||||
if (arena == NULL)
|
if (arena == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
mod = PyParser_ASTFromFile(fp, pathname, Py_file_input, 0, 0, 0,
|
mod = PyParser_ASTFromFile(fp, pathname, Py_file_input, 0, 0, &flags,
|
||||||
NULL, arena);
|
NULL, arena);
|
||||||
if (mod) {
|
if (mod) {
|
||||||
co = PyAST_Compile(mod, pathname, NULL, arena);
|
co = PyAST_Compile(mod, pathname, NULL, arena);
|
||||||
|
|
|
@ -774,8 +774,11 @@ PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flag
|
||||||
#define PARSER_FLAGS(flags) \
|
#define PARSER_FLAGS(flags) \
|
||||||
((flags) ? ((((flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
|
((flags) ? ((((flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
|
||||||
PyPARSE_DONT_IMPLY_DEDENT : 0) \
|
PyPARSE_DONT_IMPLY_DEDENT : 0) \
|
||||||
| ((flags)->cf_flags & CO_FUTURE_PRINT_FUNCTION ? \
|
| (((flags)->cf_flags & CO_FUTURE_PRINT_FUNCTION) ? \
|
||||||
PyPARSE_PRINT_IS_FUNCTION : 0)) : 0)
|
PyPARSE_PRINT_IS_FUNCTION : 0) \
|
||||||
|
| (((flags)->cf_flags & CO_FUTURE_UNICODE_LITERALS) ? \
|
||||||
|
PyPARSE_UNICODE_LITERALS : 0) \
|
||||||
|
) : 0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int
|
int
|
||||||
|
@ -1390,11 +1393,12 @@ Py_SymtableString(const char *str, const char *filename, int start)
|
||||||
{
|
{
|
||||||
struct symtable *st;
|
struct symtable *st;
|
||||||
mod_ty mod;
|
mod_ty mod;
|
||||||
|
PyCompilerFlags flags;
|
||||||
PyArena *arena = PyArena_New();
|
PyArena *arena = PyArena_New();
|
||||||
if (arena == NULL)
|
if (arena == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
mod = PyParser_ASTFromString(str, filename, start, NULL, arena);
|
mod = PyParser_ASTFromString(str, filename, start, &flags, arena);
|
||||||
if (mod == NULL) {
|
if (mod == NULL) {
|
||||||
PyArena_Free(arena);
|
PyArena_Free(arena);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -1411,10 +1415,16 @@ PyParser_ASTFromString(const char *s, const char *filename, int start,
|
||||||
{
|
{
|
||||||
mod_ty mod;
|
mod_ty mod;
|
||||||
perrdetail err;
|
perrdetail err;
|
||||||
node *n = PyParser_ParseStringFlagsFilename(s, filename,
|
int iflags;
|
||||||
|
iflags = PARSER_FLAGS(flags);
|
||||||
|
|
||||||
|
node *n = PyParser_ParseStringFlagsFilenameEx(s, filename,
|
||||||
&_PyParser_Grammar, start, &err,
|
&_PyParser_Grammar, start, &err,
|
||||||
PARSER_FLAGS(flags));
|
&iflags);
|
||||||
if (n) {
|
if (n) {
|
||||||
|
if (flags) {
|
||||||
|
flags->cf_flags |= iflags & PyCF_MASK;
|
||||||
|
}
|
||||||
mod = PyAST_FromNode(n, flags, filename, arena);
|
mod = PyAST_FromNode(n, flags, filename, arena);
|
||||||
PyNode_Free(n);
|
PyNode_Free(n);
|
||||||
return mod;
|
return mod;
|
||||||
|
@ -1432,9 +1442,15 @@ PyParser_ASTFromFile(FILE *fp, const char *filename, int start, char *ps1,
|
||||||
{
|
{
|
||||||
mod_ty mod;
|
mod_ty mod;
|
||||||
perrdetail err;
|
perrdetail err;
|
||||||
node *n = PyParser_ParseFileFlags(fp, filename, &_PyParser_Grammar,
|
int iflags;
|
||||||
start, ps1, ps2, &err, PARSER_FLAGS(flags));
|
|
||||||
|
iflags = PARSER_FLAGS(flags);
|
||||||
|
node *n = PyParser_ParseFileFlagsEx(fp, filename, &_PyParser_Grammar,
|
||||||
|
start, ps1, ps2, &err, &iflags);
|
||||||
if (n) {
|
if (n) {
|
||||||
|
if (flags) {
|
||||||
|
flags->cf_flags |= iflags & PyCF_MASK;
|
||||||
|
}
|
||||||
mod = PyAST_FromNode(n, flags, filename, arena);
|
mod = PyAST_FromNode(n, flags, filename, arena);
|
||||||
PyNode_Free(n);
|
PyNode_Free(n);
|
||||||
return mod;
|
return mod;
|
||||||
|
|
Loading…
Reference in New Issue