Magic-Mirror/python-uncompyle6
1
0
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2024-12-03 18:41:03 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #470 from rocky/comprehension-in-lambda-parsing-bug

Browse Source 
Handle comprehensions inside a lambda
This commit is contained in:
R. Bernstein 2023-08-12 06:38:28 -04:00 committed by GitHub
commit 9a14d2dea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_2.7_run/03_comprehension_in_lambda.pyc Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

11
test/simple_source/bug27+/03_comprehension_in_lambda.py Normal file
View File

@ -0,0 +1,11 @@
# RUNNABLE!
# From issue 469
"""This program is self-checking!"""
my_dict = (lambda variable0: {variable1: 123 for variable1 in variable0})([1, 2, 3])
assert my_dict[1] == 123
my_set = (lambda variable0: {variable1 for variable1 in variable0})([1, 2, 3])
assert 2 in my_set

5
uncompyle6/parsers/parse27.py
View File

@ -37,11 +37,16 @@ class Python27Parser(Python2Parser):
dict_comp ::= LOAD_DICTCOMP MAKE_FUNCTION_0 expr GET_ITER CALL_FUNCTION_1
stmt ::= dict_comp_func
dict_comp_func ::= BUILD_MAP_0 LOAD_FAST FOR_ITER store
comp_iter JUMP_BACK RETURN_VALUE RETURN_LAST
dict_comp_func ::= BUILD_MAP_0 LOAD_FAST FOR_ITER store
comp_iter JUMP_BACK RETURN_VALUE_LAMBDA LAMBDA_MARKER
set_comp_func ::= BUILD_SET_0 LOAD_FAST FOR_ITER store comp_iter
JUMP_BACK RETURN_VALUE RETURN_LAST
set_comp_func ::= BUILD_SET_0 LOAD_FAST FOR_ITER store comp_iter
JUMP_BACK RETURN_VALUE_LAMBDA LAMBDA_MARKER
comp_iter ::= comp_if_not
comp_if_not ::= expr jmp_true comp_iter

12
uncompyle6/parsers/parse30.py
View File

@ -74,9 +74,15 @@ class Python30Parser(Python31Parser):
# Need to keep LOAD_FAST as index 1
set_comp_header ::= BUILD_SET_0 DUP_TOP STORE_FAST
set_comp_func ::= set_comp_header
LOAD_ARG FOR_ITER store comp_iter
JUMP_BACK COME_FROM POP_TOP JUMP_BACK RETURN_VALUE RETURN_LAST
JUMP_BACK COME_FROM POP_TOP JUMP_BACK
RETURN_VALUE RETURN_LAST
set_comp_func ::= set_comp_header
LOAD_ARG FOR_ITER store comp_iter
JUMP_BACK COME_FROM POP_TOP JUMP_BACK
RETURN_VALUE_LAMBDA LAMBDA_MARKER
list_comp_header ::= BUILD_LIST_0 DUP_TOP STORE_FAST
list_comp ::= list_comp_header
@ -107,6 +113,10 @@ class Python30Parser(Python31Parser):
DUP_TOP STORE_FAST
LOAD_ARG FOR_ITER store
dict_comp_iter JUMP_BACK RETURN_VALUE RETURN_LAST
dict_comp_func ::= BUILD_MAP_0
DUP_TOP STORE_FAST
LOAD_ARG FOR_ITER store
dict_comp_iter JUMP_BACK RETURN_VALUE_LAMBDA LAMBDA_MARKER
stmt ::= try_except30
try_except30 ::= SETUP_EXCEPT suite_stmts_opt

7
uncompyle6/parsers/parse37.py
View File

@ -741,9 +741,13 @@ class Python37Parser(Python37BaseParser):
set_comp_func ::= BUILD_SET_0 LOAD_ARG for_iter store comp_iter
JUMP_BACK RETURN_VALUE RETURN_LAST
set_comp_func ::= BUILD_SET_0 LOAD_ARG for_iter store comp_iter
JUMP_BACK RETURN_VALUE_LAMBDA LAMBDA_MARKER
set_comp_func ::= BUILD_SET_0 LOAD_ARG for_iter store comp_iter
COME_FROM JUMP_BACK RETURN_VALUE RETURN_LAST
set_comp_func ::= BUILD_SET_0 LOAD_ARG for_iter store comp_iter
COME_FROM JUMP_BACK RETURN_VALUE_LAMBDA LAMBDA_MARKER
comp_body ::= dict_comp_body
comp_body ::= set_comp_body
@ -757,8 +761,11 @@ class Python37Parser(Python37BaseParser):
""""
expr ::= dict_comp
stmt ::= dict_comp_func
dict_comp_func ::= BUILD_MAP_0 LOAD_ARG for_iter store
comp_iter JUMP_BACK RETURN_VALUE RETURN_LAST
dict_comp_func ::= BUILD_MAP_0 LOAD_ARG for_iter store
comp_iter JUMP_BACK RETURN_VALUE_LAMBDA LAMBDA_MARKER
comp_iter ::= comp_if
comp_iter ::= comp_if_not