VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2025-12-07 21:34:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix fstring format spec parsing, fixes #74

Browse Source
This commit is contained in:
Dave Halter
2019-06-02 15:18:42 +02:00
parent 4f5fdd5a70
commit 917b4421f3
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
parso/python/tokenize.py
View File

@@ -120,6 +120,8 @@ def _get_token_collection(version_info):
fstring_string_single_line = _compile(r'(?:[^{}\r\n]+|\{\{|\}\})+') fstring_string_single_line = _compile(r'(?:[^{}\r\n]+|\{\{|\}\})+')
fstring_string_multi_line = _compile(r'(?:[^{}]+|\{\{|\}\})+') fstring_string_multi_line = _compile(r'(?:[^{}]+|\{\{|\}\})+')
fstring_format_spec_single_line = _compile(r'[^{}\r\n]+')
fstring_format_spec_multi_line = _compile(r'[^{}]+')
def _create_token_collection(version_info): def _create_token_collection(version_info):
@@ -283,7 +285,10 @@ class FStringNode(object):
return len(self.quote) == 3 return len(self.quote) == 3
def is_in_expr(self): def is_in_expr(self):
return (self.parentheses_count - self.format_spec_count) > 0 return self.parentheses_count > self.format_spec_count
def is_in_format_spec(self):
return not self.is_in_expr() and self.format_spec_count
def _close_fstring_if_necessary(fstring_stack, string, start_pos, additional_prefix): def _close_fstring_if_necessary(fstring_stack, string, start_pos, additional_prefix):
@@ -305,10 +310,18 @@ def _close_fstring_if_necessary(fstring_stack, string, start_pos, additional_pre
def _find_fstring_string(endpats, fstring_stack, line, lnum, pos): def _find_fstring_string(endpats, fstring_stack, line, lnum, pos):
tos = fstring_stack[-1] tos = fstring_stack[-1]
allow_multiline = tos.allow_multiline() allow_multiline = tos.allow_multiline()
if allow_multiline: if tos.is_in_format_spec():
match = fstring_string_multi_line.match(line, pos) if allow_multiline:
regex = fstring_format_spec_multi_line
else:
regex = fstring_format_spec_single_line
else: else:
match = fstring_string_single_line.match(line, pos) if allow_multiline:
regex = fstring_string_multi_line
else:
regex = fstring_string_single_line
match = regex.match(line, pos)
if match is None: if match is None:
return tos.previous_lines, pos return tos.previous_lines, pos
@@ -577,7 +590,8 @@ def tokenize_lines(lines, version_info, start_pos=(1, 0)):
if paren_level: if paren_level:
paren_level -= 1 paren_level -= 1
elif token == ':' and fstring_stack \ elif token == ':' and fstring_stack \
and fstring_stack[-1].parentheses_count == 1: and fstring_stack[-1].parentheses_count \
- fstring_stack[-1].format_spec_count == 1:
fstring_stack[-1].format_spec_count += 1 fstring_stack[-1].format_spec_count += 1
yield PythonToken(OP, token, spos, prefix) yield PythonToken(OP, token, spos, prefix)

3
test/test_fstring.py
View File

@@ -21,6 +21,9 @@ def grammar():
'{1:1.{32}}', '{1:1.{32}}',
'{1::>4}', '{1::>4}',
'{foo} {bar}', '{foo} {bar}',
'{x:{y}}',
'{x:{y:}}',
'{x:{y:1}}',
# Escapes # Escapes
'{{}}', '{{}}',