Magic-Mirror/python-uncompyle6
1
0
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2024-10-07 10:13:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #399 from rocky/genexpr-3.6

Browse Source 
3.6 async hacking
This commit is contained in:
R. Bernstein 2022-05-07 07:10:33 -04:00 committed by GitHub
commit fbe4be3bb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.6/03_async_from_coroutine.pyc
View File

Binary file not shown.

BIN
test/bytecode_3.7/03_async_from_coroutine.pyc Normal file
View File

Binary file not shown.

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

Binary file not shown.

9
test/simple_source/bug36/03_async_from_coroutine.py
View File

@ -1,4 +1,13 @@
# These are from 3.6 test_coroutines.py
async def run_gen(f):
return (10 async for i in f)
async def run_list(f):
return [i async for i in f()]
# async def run_dict():
# return {i + 1 async for i in [10, 20]}
async def iterate(gen):
res = []
async for i in gen:

8
uncompyle6/parsers/parse36.py
View File

@ -192,6 +192,8 @@ class Python36Parser(Python35Parser):
compare_chained2 ::= expr COMPARE_OP come_froms JUMP_FORWARD
stmt ::= genexpr_func
genexpr_func ::= LOAD_ARG _come_froms FOR_ITER store comp_iter JUMP_BACK
"""
# Some of this is duplicated from parse37. Eventually we'll probably rebase from
@ -336,9 +338,9 @@ class Python36Parser(Python35Parser):
self.addRule(
"""
expr ::= generator_exp_async
generator_exp_async ::= load_genexpr LOAD_STR MAKE_FUNCTION_0 expr
GET_AITER CALL_FUNCTION_1
generator_exp_async ::= load_genexpr LOAD_STR MAKE_FUNCTION_0 expr
GET_AITER LOAD_CONST YIELD_FROM CALL_FUNCTION_1
stmt ::= genexpr_func_async
func_async_prefix ::= _come_froms
@ -349,7 +351,7 @@ class Python36Parser(Python35Parser):
END_FINALLY COME_FROM
genexpr_func_async ::= LOAD_ARG func_async_prefix
store func_async_middle comp_iter
JUMP_BACK COME_FROM
JUMP_BACK
POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_TOP
expr ::= list_comp_async

2
uncompyle6/semantics/gencomp.py
View File

@ -182,7 +182,7 @@ class ComprehensionMixin:
self.write(" in ")
if node[2] == "expr":
iter_expr = node[2]
elif node[3] == "get_aiter":
elif node[3] in ("expr", "get_aiter"):
iter_expr = node[3]
else:
iter_expr = node[-3]

9
uncompyle6/semantics/n_actions.py
View File

@ -681,15 +681,18 @@ class NonterminalActions:
self.write("(")
iter_index = 3
if self.version > (3, 2):
code_index = -6
if self.version > (3, 6):
# Python 3.7+ adds optional "come_froms" at node[0]
if self.version >= (3, 6):
if node[0].kind in ("load_closure", "load_genexpr") and self.version >= (3, 8):
code_index = -6
is_lambda = self.is_lambda
if node[0].kind == "load_genexpr":
self.is_lambda = False
self.closure_walk(node, collection_index=4)
self.is_lambda = is_lambda
else:
# Python 3.7+ adds optional "come_froms" at node[0] so count from the end
if node == "generator_exp_async" and self.version[:2] == (3, 6):
code_index = 0
else:
code_index = -6
iter_index = 4 if self.version < (3, 8) else 3