From 20af515dda469b7a35524732feac49c909382666 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Fri, 11 Aug 2023 12:13:46 -0400
Subject: [PATCH] Handle comprehensions inside a lambda

---
 .../03_comprehension_in_lambda.pyc                | Bin 0 -> 975 bytes
 .../03_comprehension_in_lambda.pyc                | Bin 0 -> 661 bytes
 .../03_comprehension_in_lambda.pyc                | Bin 0 -> 678 bytes
 .../bug27+/03_comprehension_in_lambda.py          |  11 +++++++++++
 uncompyle6/parsers/parse27.py                     |   5 +++++
 uncompyle6/parsers/parse30.py                     |  12 +++++++++++-
 uncompyle6/parsers/parse37.py                     |   7 +++++++
 7 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 test/bytecode_2.7_run/03_comprehension_in_lambda.pyc
 create mode 100644 test/bytecode_3.7_run/03_comprehension_in_lambda.pyc
 create mode 100644 test/bytecode_3.8_run/03_comprehension_in_lambda.pyc
 create mode 100644 test/simple_source/bug27+/03_comprehension_in_lambda.py

diff --git a/test/bytecode_2.7_run/03_comprehension_in_lambda.pyc b/test/bytecode_2.7_run/03_comprehension_in_lambda.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e7b3586a3ba707511a1f61d1324d321ebc7a7cb3
GIT binary patch
literal 975
zcmbtS%}T>S5S}EOs`zsgdl9`AM6EyIrHG<lJ*0vl=#pmFc4^Yo-K`+%MSTK&4<E-D
z@df-Qsi^452Ikw@%<O(M-)!(cGxd7<CKDQdV_5fKwgr$xXF!jhfIi89<QTOBdi3bb
zBjxeWsvM`TPj;J}PY?JN{*{fB0jYqxA=!)1%nCJY6U?;;IO%A+)HiwC#Mu&DtJ2HW
zq@$9q?zNW_4=HRu>;PtG0cB-(M2D!TS>xDok;xu+(uCP6KocSDe2(r>A$*Tse7Xv8
zh%eQ*fEtX7JJ1NxTHQ@zxsHvFTdCS8!<=I`8Fbc9m9Y81Bx=1iXm9SUtk<_hl4pIR
zI;v-N-V?ef(l~3$c&&e9r*Nzxb>cW@H{?s0XmZHRh5Vqbk4))U-9}kKLFlk2U9`;9
zI$+@D|Di9RE%cp-(<$|xW_=;<^H5wwzUdnAHe&XXJF`5ShE=7Otn4o>BkpiyqKMn%
z`y+l&$2CS*0SF=UM2N!AZUoQO@tfSYRvCxk9~qMy$74nqm41~{c>jDw<w&z!4pOzt
P#n=fz=r8#5{(|=bfy2f^

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7_run/03_comprehension_in_lambda.pyc b/test/bytecode_3.7_run/03_comprehension_in_lambda.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7a80bf5cc4588864c0cf9cad091288e0e6a3e27f
GIT binary patch
literal 661
zcmb7CO;5r=5S`tY@{wQ+2QT^qY)k<0;H4o(J#*n;LSmZI-9VF;;#N#hIKeN_U*W}{
z<AJNEp1pB$W}%em$xY^Ux_$d*=54R5)e7MHxcd}G4B(4ivSng&g^`>h2oP)uf(t{K
z17pE@APT>Bn6SEF7k$*xi=G_g1|vB@5KQnT%-|Ll44Fn}M<p7S>k_qw5FqWoGG_v2
z?2SK|NN4E_es~9)uXw$=DnEHD@cN-VS9Ds#x|IacIFxP@Pn0hk{mGzpdDduNxPBas
zl^n`Z62v1n7`dSr^@Ud-PuCSk1pXrt+7^{3H4C0koDHR2cf#2B!UU5YQCG8B-b6ER
zLKRS8RmzT&<~IhY5<*I*q*Nj`5OxOq(<?fwy*k8XNM4oZY{p)-Q+X>kSHx6gZN94;
zT$i0hZl<O`Ae;I)YkP0%jJF+H75}Q~*+@r~5jr;S6{D$3cJ(YwP+_mUzOJoFQ7k5*
M+!#+?*326F0Raepga7~l

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.8_run/03_comprehension_in_lambda.pyc b/test/bytecode_3.8_run/03_comprehension_in_lambda.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..76233c0eaf8a287694879b08b3a39daad0e27b28
GIT binary patch
literal 678
zcmbVKO;5r=5Z&FD@{wQ+2QT^qBqo4(@X`<yJ#!((q={)tr-3Fd#a%H0^#s2_e+3tR
zjt8!udiLhYnXN$4o14tbZ2M;B&1<i#)e6J&cJmGgoUsqO<d2D$3k-FP01WtofdB){
zfidR}gTk*T9IPIz7k%utIg|^GOANJ#035`EJ+Uh`=g2m?J9MJb*dEbq2q98$E6@Ci
z1A7&BCYJE@5nn9XQmjOy<&+;h8G8LFIF(eb;j68}cpL?;N+!||n*GV3eSXqxow<Gz
zk7Y0nMk-83Za8uyFYbfa7*AIf8$$n{2px;Y6Idu-u-TEF(K-z~N_;O;m~6;;;*xKL
zw6;QI0h_E!>vC%OiNRzEAtiHC5}g_dJ4XD&H|n8%+s9-`zLm(g7wuY367h0Zt*~sX
zAX}Y&2}PfPR-YZNmFE^;GqWDWzuok5)JK*Px^>|c<Ecx2ITj{ZpBt~g*^f(c0+T4n
L+$RY&v&O#x_#b_k

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug27+/03_comprehension_in_lambda.py b/test/simple_source/bug27+/03_comprehension_in_lambda.py
new file mode 100644
index 000000000..6928575dd
--- /dev/null
+++ b/test/simple_source/bug27+/03_comprehension_in_lambda.py
@@ -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
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index 92f0d4b6b..06498caa3 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/uncompyle6/parsers/parse27.py
@@ -37,11 +37,16 @@ def p_comprehension27(self, args):
         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
diff --git a/uncompyle6/parsers/parse30.py b/uncompyle6/parsers/parse30.py
index f91066654..f1d2546ce 100644
--- a/uncompyle6/parsers/parse30.py
+++ b/uncompyle6/parsers/parse30.py
@@ -74,9 +74,15 @@ def p_30(self, args):
 
         # 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
         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_LAMBDA LAMBDA_MARKER
 
         list_comp_header ::= BUILD_LIST_0 DUP_TOP STORE_FAST
         list_comp        ::= list_comp_header
@@ -107,6 +113,10 @@ def p_30(self, args):
                              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
diff --git a/uncompyle6/parsers/parse37.py b/uncompyle6/parsers/parse37.py
index fad4d1ce4..ad2e6248a 100644
--- a/uncompyle6/parsers/parse37.py
+++ b/uncompyle6/parsers/parse37.py
@@ -741,9 +741,13 @@ def p_comprehension3(self, args):
 
         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 @@ def p_dict_comp3(self, args):
         """"
         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