diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-10-06 18:52:52 +0300 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-10-06 18:52:52 +0300 |
| commit | a492823f37b341093e54c8461ed5bd9554d68087 (patch) | |
| tree | a263ba539bee26f760f228a85f2c2beb93dafe18 /Parser | |
| parent | d23a7c5d830b5bdce90a7989f7f11b2766c3870e (diff) | |
| parent | bff65535a5201b31b3b5579067bcec8f9e7af7e8 (diff) | |
| download | cpython-a492823f37b341093e54c8461ed5bd9554d68087.tar.gz | |
Merge with 3.5.
Diffstat (limited to 'Parser')
| -rw-r--r-- | Parser/Python.asdl | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | Parser/asdl_c.py | 2 | ||||
| -rw-r--r-- | Parser/tokenizer.c | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Parser/Python.asdl b/Parser/Python.asdl index cd0832da8d..22775c6835 100644 --- a/Parser/Python.asdl +++ b/Parser/Python.asdl @@ -71,6 +71,8 @@ module Python | Call(expr func, expr* args, keyword* keywords) | Num(object n) -- a number as a PyObject. | Str(string s) -- need to specify raw, unicode, etc? + | FormattedValue(expr value, int? conversion, expr? format_spec) + | JoinedStr(expr* values) | Bytes(bytes s) | NameConstant(singleton value) | Ellipsis diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index a5e35d93fd..d5971226b1 100755..100644 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -898,7 +898,7 @@ static int obj2ast_int(PyObject* obj, int* out, PyArena* arena) return 1; } - i = (int)PyLong_AsLong(obj); + i = _PyLong_AsInt(obj); if (i == -1 && PyErr_Occurred()) return 1; *out = i; diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index 04baeaf38a..2369be46ae 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -1477,17 +1477,19 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) nonascii = 0; if (is_potential_identifier_start(c)) { /* Process b"", r"", u"", br"" and rb"" */ - int saw_b = 0, saw_r = 0, saw_u = 0; + int saw_b = 0, saw_r = 0, saw_u = 0, saw_f = 0; while (1) { - if (!(saw_b || saw_u) && (c == 'b' || c == 'B')) + if (!(saw_b || saw_u || saw_f) && (c == 'b' || c == 'B')) saw_b = 1; /* Since this is a backwards compatibility support literal we don't want to support it in arbitrary order like byte literals. */ - else if (!(saw_b || saw_u || saw_r) && (c == 'u' || c == 'U')) + else if (!(saw_b || saw_u || saw_r || saw_f) && (c == 'u' || c == 'U')) saw_u = 1; /* ur"" and ru"" are not supported */ else if (!(saw_r || saw_u) && (c == 'r' || c == 'R')) saw_r = 1; + else if (!(saw_f || saw_b || saw_u) && (c == 'f' || c == 'F')) + saw_f = 1; else break; c = tok_nextc(tok); @@ -1741,7 +1743,7 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) else { end_quote_size = 0; if (c == '\\') - c = tok_nextc(tok); /* skip escaped char */ + c = tok_nextc(tok); /* skip escaped char */ } } |