jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-03 00:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start 3.8 async for/else

Browse Source
This commit is contained in:
rocky
2019-04-14 06:54:08 -04:00
parent 9b550b9dda
commit c5cfd36a61
3 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.8/03_async_await.pyc Normal file
View File

Binary file not shown.

47
uncompyle6/parsers/parse38.py
View File

@@ -26,6 +26,7 @@ class Python38Parser(Python37Parser):
def p_38misc(self, args): def p_38misc(self, args):
""" """
stmt ::= async_for_stmt38 stmt ::= async_for_stmt38
stmt ::= async_forelse_stmt38
stmt ::= for38 stmt ::= for38
stmt ::= forelsestmt38 stmt ::= forelsestmt38
stmt ::= forelselaststmt38 stmt ::= forelselaststmt38
@@ -37,11 +38,11 @@ class Python38Parser(Python37Parser):
stmt ::= whileTruestmt38 stmt ::= whileTruestmt38
stmt ::= call stmt ::= call
# FIXME this should be restricted to being inside a try block # FIXME: this should be restricted to being inside a try block
stmt ::= except_ret38 stmt ::= except_ret38
# FIXME this should be added only when seeing GET_AITER or YIELD_FROM # FIXME: this should be added only when seeing GET_AITER or YIELD_FROM
async_for_stmt38 ::= expr async_for_stmt38 ::= expr
GET_AITER GET_AITER
SETUP_FINALLY SETUP_FINALLY
GET_ANEXT GET_ANEXT
@@ -52,6 +53,21 @@ class Python38Parser(Python37Parser):
COME_FROM_FINALLY COME_FROM_FINALLY
END_ASYNC_FOR END_ASYNC_FOR
# FIXME: come froms after the else_suite or END_ASYNC_FOR distinguish which of
# for / forelse is used. Add come froms and check of add up control-flow detection phase.
async_forelse_stmt38 ::= expr
GET_AITER
SETUP_FINALLY
GET_ANEXT
LOAD_CONST
YIELD_FROM
POP_BLOCK
store for_block
COME_FROM_FINALLY
END_ASYNC_FOR
else_suite
async_with_stmt ::= expr BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM async_with_stmt ::= expr BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
SETUP_ASYNC_WITH POP_TOP SETUP_ASYNC_WITH POP_TOP
suite_stmts suite_stmts
@@ -141,6 +157,18 @@ class Python38Parser(Python37Parser):
stmt ::= forelsestmt stmt ::= forelsestmt
stmt ::= try_except36 stmt ::= try_except36
async_for_stmt ::= SETUP_LOOP expr
GET_AITER
SETUP_EXCEPT GET_ANEXT LOAD_CONST
YIELD_FROM
store
POP_BLOCK JUMP_FORWARD COME_FROM_EXCEPT DUP_TOP
LOAD_GLOBAL COMPARE_OP POP_JUMP_IF_TRUE
END_FINALLY COME_FROM
for_block
COME_FROM
POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_TOP POP_BLOCK
COME_FROM_LOOP
async_for_stmt37 ::= SETUP_LOOP expr async_for_stmt37 ::= SETUP_LOOP expr
GET_AITER GET_AITER
SETUP_EXCEPT GET_ANEXT SETUP_EXCEPT GET_ANEXT
@@ -153,6 +181,19 @@ class Python38Parser(Python37Parser):
POP_TOP POP_BLOCK POP_TOP POP_BLOCK
COME_FROM_LOOP COME_FROM_LOOP
async_forelse_stmt ::= SETUP_LOOP expr
GET_AITER
SETUP_EXCEPT GET_ANEXT LOAD_CONST
YIELD_FROM
store
POP_BLOCK JUMP_FORWARD COME_FROM_EXCEPT DUP_TOP
LOAD_GLOBAL COMPARE_OP POP_JUMP_IF_TRUE
END_FINALLY COME_FROM
for_block
COME_FROM
POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_TOP POP_BLOCK
else_suite COME_FROM_LOOP
for ::= SETUP_LOOP expr for_iter store for_block POP_BLOCK for ::= SETUP_LOOP expr for_iter store for_block POP_BLOCK
for ::= SETUP_LOOP expr for_iter store for_block POP_BLOCK NOP for ::= SETUP_LOOP expr for_iter store for_block POP_BLOCK NOP

4
uncompyle6/semantics/customize3.py
View File

@@ -956,6 +956,10 @@ def customize_for_version3(self, version):
'%|async for %c in %c:\n%+%c%-%-\n\n', '%|async for %c in %c:\n%+%c%-%-\n\n',
(7, 'store'), (0, 'expr'), (8, 'for_block') ), (7, 'store'), (0, 'expr'), (8, 'for_block') ),
'async_forelse_stmt38': (
'%|async for %c in %c:\n%+%c%-%|else:\n%+%c%-\n\n',
(7, 'store'), (0, 'expr'), (8, 'for_block'), (-1, 'else_suite') ),
'async_with_stmt38': ( 'async_with_stmt38': (
'%|async with %c:\n%+%|%c%-', '%|async with %c:\n%+%|%c%-',
(0, 'expr'), 7), (0, 'expr'), 7),