Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2017-11-24 21:48:14 -05:00
28 changed files with 221 additions and 38 deletions

View File

@@ -8,8 +8,9 @@ from uncompyle6.parsers.parse3 import Python3Parser
class Python32Parser(Python3Parser):
def p_32to35(self, args):
"""
conditional ::= expr jmp_false expr jump_forward_else expr COME_FROM
cmp_list2 ::= expr COMPARE_OP RETURN_VALUE
conditional ::= expr jmp_false expr jump_forward_else expr COME_FROM
# used exclusively in compare_chained
compare_chained2 ::= expr COMPARE_OP RETURN_VALUE
# Store locals is only in Python 3.0 to 3.3
stmt ::= store_locals
@@ -55,7 +56,7 @@ class Python32Parser(Python3Parser):
def add_custom_rules(self, tokens, customize):
# self.remove_rules("""
# cmp_list2 ::= expr COMPARE_OP RETURN_VALUE
# compare_chained2 ::= expr COMPARE_OP RETURN_VALUE
# """)
super(Python32Parser, self).add_custom_rules(tokens, customize)
for i, token in enumerate(tokens):