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

Fix an issue with async funcdefs in different forms.

Browse Source
This commit is contained in:
Dave Halter
2017-07-20 17:37:57 +02:00
parent fa30872d26
commit 05f86b9c87
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
parso/python/normalizer.py
View File

@@ -3,7 +3,6 @@ from contextlib import contextmanager
from parso.normalizer import Normalizer, NormalizerConfig, Issue from parso.normalizer import Normalizer, NormalizerConfig, Issue
_BLOCK_STMTS = ('if_stmt', 'while_stmt', 'for_stmt', 'try_stmt', 'with_stmt') _BLOCK_STMTS = ('if_stmt', 'while_stmt', 'for_stmt', 'try_stmt', 'with_stmt')
_ASYNC_FUNC_TYPES = 'async_funcdef', 'async_stmt'
# This is the maximal block size given by python. # This is the maximal block size given by python.
_MAX_BLOCK_SIZE = 20 _MAX_BLOCK_SIZE = 20
@@ -25,6 +24,10 @@ class Context(object):
self.blocks = [] self.blocks = []
self.parent_context = parent_context self.parent_context = parent_context
def is_async_funcdef(self):
return self.node.type == 'funcdef' \
and self.node.parent.type in ('async_funcdef', 'async_stmt')
@contextmanager @contextmanager
def add_block(self, node): def add_block(self, node):
self.blocks.append(node) self.blocks.append(node)
@@ -131,12 +134,10 @@ class ErrorFinder(Normalizer):
if self._context.node.type != 'funcdef': if self._context.node.type != 'funcdef':
self._add_syntax_error("'%s' outside function" % leaf.value, leaf) self._add_syntax_error("'%s' outside function" % leaf.value, leaf)
elif leaf.value == 'await': elif leaf.value == 'await':
if self._context.node.type != 'funcdef' \ if not self._context.is_async_funcdef():
or self._context.node.parent.type not in _ASYNC_FUNC_TYPES:
self._add_syntax_error("'await' outside async function", leaf) self._add_syntax_error("'await' outside async function", leaf)
elif leaf.value == 'from' and leaf.parent.type == 'yield_arg' \ elif leaf.value == 'from' and leaf.parent.type == 'yield_arg' \
and self._context.node.type == 'funcdef' \ and self._context.is_async_funcdef():
and self._context.node.parent.type in _ASYNC_FUNC_TYPES:
yield_ = leaf.parent.parent yield_ = leaf.parent.parent
self._add_syntax_error("'yield from' inside async function", yield_) self._add_syntax_error("'yield from' inside async function", yield_)
return '' return ''