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

Merge branch 'master' into python-2.4

Browse Source
This commit is contained in:
rocky
2017-11-26 01:27:56 -05:00
parent 5cf4f0a82f 0965e2cc96
commit 218e73540a
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uncompyle6/parser.py
View File

@@ -419,15 +419,12 @@ class PythonParser(GenericASTBuilder):
setcomp ::= LOAD_SETCOMP MAKE_FUNCTION_0 expr GET_ITER CALL_FUNCTION_1 setcomp ::= LOAD_SETCOMP MAKE_FUNCTION_0 expr GET_ITER CALL_FUNCTION_1
comp_iter ::= comp_if comp_iter ::= comp_if
comp_iter ::= comp_ifnot
comp_iter ::= comp_for comp_iter ::= comp_for
comp_iter ::= comp_body comp_iter ::= comp_body
comp_body ::= gen_comp_body comp_body ::= gen_comp_body
gen_comp_body ::= expr YIELD_VALUE POP_TOP gen_comp_body ::= expr YIELD_VALUE POP_TOP
comp_if ::= expr jmp_false comp_iter comp_if ::= expr jmp_false comp_iter
comp_ifnot ::= expr jmp_true comp_iter
comp_for ::= expr _for designator comp_iter JUMP_BACK comp_for ::= expr _for designator comp_iter JUMP_BACK
""" """
@@ -517,12 +514,10 @@ class PythonParser(GenericASTBuilder):
mapexpr ::= BUILD_MAP kvlist mapexpr ::= BUILD_MAP kvlist
kvlist ::= kvlist kv
kvlist ::= kvlist kv2 kvlist ::= kvlist kv2
kvlist ::= kvlist kv3 kvlist ::= kvlist kv3
kvlist ::= kvlist ::=
kv ::= DUP_TOP expr ROT_TWO expr STORE_SUBSCR
kv2 ::= DUP_TOP expr expr ROT_THREE STORE_SUBSCR kv2 ::= DUP_TOP expr expr ROT_THREE STORE_SUBSCR
kv3 ::= expr expr STORE_MAP kv3 ::= expr expr STORE_MAP

3
uncompyle6/parsers/parse21.py
View File

@@ -20,6 +20,9 @@ class Python21Parser(Python22Parser):
forstmt ::= SETUP_LOOP expr _for designator forstmt ::= SETUP_LOOP expr _for designator
l_stmts_opt _jump_back l_stmts_opt _jump_back
POP_BLOCK COME_FROM POP_BLOCK COME_FROM
kvlist ::= kvlist kv
kv ::= DUP_TOP expr ROT_TWO expr STORE_SUBSCR
""" """
def p_import21(self, args): def p_import21(self, args):

7
uncompyle6/parsers/parse26.py
View File

@@ -247,9 +247,10 @@ class Python26Parser(Python2Parser):
# compare_chained is like x <= y <= z # compare_chained is like x <= y <= z
compare_chained ::= expr compare_chained1 ROT_TWO COME_FROM POP_TOP _come_from compare_chained ::= expr compare_chained1 ROT_TWO COME_FROM POP_TOP _come_from
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP jmp_false compare_chained1 _come_from compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP jmp_false compare_chained2 _come_from jmp_false compare_chained1 _come_from
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
jmp_false compare_chained2 _come_from
return_if_lambda ::= RETURN_END_IF_LAMBDA POP_TOP return_if_lambda ::= RETURN_END_IF_LAMBDA POP_TOP
conditional_lambda ::= expr jmp_false_then expr return_if_lambda conditional_lambda ::= expr jmp_false_then expr return_if_lambda
return_stmt_lambda LAMBDA_MARKER return_stmt_lambda LAMBDA_MARKER

3
uncompyle6/parsers/parse32.py
View File

@@ -9,8 +9,11 @@ class Python32Parser(Python3Parser):
def p_32to35(self, args): def p_32to35(self, args):
""" """
conditional ::= expr jmp_false expr jump_forward_else expr COME_FROM conditional ::= expr jmp_false expr jump_forward_else expr COME_FROM
# compare_chained2 is used in a "chained_compare": x <= y <= z
# used exclusively in compare_chained # used exclusively in compare_chained
compare_chained2 ::= expr COMPARE_OP RETURN_VALUE compare_chained2 ::= expr COMPARE_OP RETURN_VALUE
compare_chained2 ::= expr COMPARE_OP RETURN_VALUE_LAMBDA
# Store locals is only in Python 3.0 to 3.3 # Store locals is only in Python 3.0 to 3.3
stmt ::= store_locals stmt ::= store_locals