VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2025-12-17 18:06:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add the remaining issues for arguments.

Browse Source
This commit is contained in:
Dave Halter
2017-07-25 02:25:06 +02:00
parent babd7fca92
commit d012353637
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
parso/python/normalizer.py
View File

@@ -183,24 +183,27 @@ class ErrorFinder(Normalizer):
self._add_syntax_error(message, node) self._add_syntax_error(message, node)
else: else:
arg_set = set() arg_set = set()
star_count = 0
kw_only = False kw_only = False
kw_unpacking_only = False kw_unpacking_only = False
# In python 3 this would be a bit easier (stars are part of # In python 3 this would be a bit easier (stars are part of
# argument), but we have to understand both. # argument), but we have to understand both.
for argument in node.children: for argument in node.children:
if argument == ',': if argument == ',':
star_count = 0
continue continue
if argument == '*': if argument in ('*', '**'):
star_count = len(argument.value) # Python 2 has the order engraved in the grammar file.
# No need to do anything here.
continue continue
if argument.type == 'argument': if argument.type == 'argument':
first = argument.children[0] first = argument.children[0]
if first in ('*', '**'): if first in ('*', '**'):
star_count = len(argument.children[0].value) if first == '*':
if first == '**': if kw_unpacking_only:
# foo(**kwargs, *args)
message = "iterable argument unpacking follows keyword argument unpacking"
self._add_syntax_error(message, argument)
else:
kw_unpacking_only = True kw_unpacking_only = True
else: # Is a keyword argument. else: # Is a keyword argument.
kw_only = True kw_only = True
@@ -213,9 +216,13 @@ class ErrorFinder(Normalizer):
arg_set.add(first.value) arg_set.add(first.value)
else: else:
if kw_unpacking_only: if kw_unpacking_only:
# f(**x, y) >= 3.5 # f(**x, y)
message = "positional argument follows keyword argument unpacking" message = "positional argument follows keyword argument unpacking"
self._add_syntax_error(message, argument) self._add_syntax_error(message, argument)
elif kw_only:
# f(x=2, y)
message = "positional argument follows keyword argument"
self._add_syntax_error(message, argument)
elif node.type == 'atom': elif node.type == 'atom':
first = node.children[0] first = node.children[0]
# e.g. 's' b'' # e.g. 's' b''

3
test/test_python_errors.py
View File

@@ -94,6 +94,9 @@ def test_indentation_errors(code, positions):
'f(lambda: 1=1)', 'f(lambda: 1=1)',
'f(x=1, x=2)', 'f(x=1, x=2)',
'f(**x, y)', 'f(**x, y)',
'f(x=2, y)',
'f(**x, *y)',
'f(**x, y=3, z)',
# IndentationError # IndentationError
' foo', ' foo',