jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-03 16:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.7 if_expr_true restriction ...

Browse Source 
condition_true -> if_expr_true
condition_lambda -> if_expr_lambda

These correspond to the Python AST names better.
This commit is contained in:
rocky
2019-05-05 16:09:10 -04:00
parent 393e5c9303
commit f2f17740ee
10 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_2.7_run/04_ifelse_parens.pyc Normal file
View File

Binary file not shown.

2
test/simple_source/branching/02_ifelse_lambda.py
View File

@@ -22,7 +22,7 @@ assert i[0]('a') == True
assert i[0]('A') == False assert i[0]('A') == False
# Issue #170. Bug is needing an "conditional_not_lambda" grammar rule # Issue #170. Bug is needing an "conditional_not_lambda" grammar rule
# in addition the the "conditional_lambda" rule # in addition the the "if_expr_lambda" rule
j = lambda a: False if not a else True j = lambda a: False if not a else True
assert j(True) == True assert j(True) == True
assert j(False) == False assert j(False) == False

2
test/simple_source/bug26/03_weird26.py
View File

@@ -8,7 +8,7 @@ list(x for x in range(10) if x % 2 if x % 3)
# expresion which evaluates True unconditionally, # expresion which evaluates True unconditionally,
# but leave dead code or junk around that we have to match on. # but leave dead code or junk around that we have to match on.
# Tests "conditional_true" rule # Tests "if_expr_true" rule
5 if 1 else 2 5 if 1 else 2
0 or max(5, 3) if 0 else 3 0 or max(5, 3) if 0 else 3

4
test/simple_source/bug27+/03_not_dead_code.py
View File

@@ -1,6 +1,6 @@
# Bug found in 2.7 test_itertools.py # Bug found in 2.7 test_itertools.py
# Bug was erroneously using reduction to unconditional_true # Bug was erroneously using reduction to if_expr_true
# A proper fix would be to use unconditional_true only when we # A proper fix would be to use if_expr_true only when we
# can determine there is or was dead code. # can determine there is or was dead code.
from itertools import izip_longest from itertools import izip_longest
for args in [['abc', range(6)]]: for args in [['abc', range(6)]]:

4
uncompyle6/parsers/parse25.py
View File

@@ -74,9 +74,9 @@ class Python25Parser(Python26Parser):
return_stmt_lambda ::= ret_expr RETURN_VALUE_LAMBDA return_stmt_lambda ::= ret_expr RETURN_VALUE_LAMBDA
setupwithas ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 setup_finally setupwithas ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 setup_finally
stmt ::= classdefdeco stmt ::= classdefdeco
stmt ::= conditional_lambda stmt ::= if_expr_lambda
stmt ::= conditional_not_lambda stmt ::= conditional_not_lambda
conditional_lambda ::= expr jmp_false_then expr return_if_lambda if_expr_lambda ::= expr jmp_false_then expr return_if_lambda
return_stmt_lambda LAMBDA_MARKER return_stmt_lambda LAMBDA_MARKER
conditional_not_lambda conditional_not_lambda
::= expr jmp_true_then expr return_if_lambda ::= expr jmp_true_then expr return_if_lambda

12
uncompyle6/parsers/parse26.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2017-2018 Rocky Bernstein # Copyright (c) 2017-2019 Rocky Bernstein
""" """
spark grammar differences over Python2 for Python 2.6. spark grammar differences over Python2 for Python 2.6.
""" """
@@ -293,19 +293,19 @@ class Python26Parser(Python2Parser):
compare_chained2 ::= expr COMPARE_OP return_lambda compare_chained2 ::= expr COMPARE_OP return_lambda
return_if_lambda ::= RETURN_END_IF_LAMBDA POP_TOP return_if_lambda ::= RETURN_END_IF_LAMBDA POP_TOP
stmt ::= conditional_lambda stmt ::= if_expr_lambda
stmt ::= conditional_not_lambda stmt ::= conditional_not_lambda
conditional_lambda ::= expr jmp_false_then expr return_if_lambda if_expr_lambda ::= expr jmp_false_then expr return_if_lambda
return_stmt_lambda LAMBDA_MARKER return_stmt_lambda LAMBDA_MARKER
conditional_not_lambda ::= conditional_not_lambda ::=
expr jmp_true_then expr return_if_lambda expr jmp_true_then expr return_if_lambda
return_stmt_lambda LAMBDA_MARKER return_stmt_lambda LAMBDA_MARKER
# conditional_true are for conditions which always evaluate true # if_expr_true are for conditions which always evaluate true
# There is dead or non-optional remnants of the condition code though, # There is dead or non-optional remnants of the condition code though,
# and we use that to match on to reconstruct the source more accurately # and we use that to match on to reconstruct the source more accurately
expr ::= conditional_true expr ::= if_expr_true
conditional_true ::= expr jf_pop expr COME_FROM if_expr_true ::= expr jf_pop expr COME_FROM
# This comes from # This comes from
# 0 or max(5, 3) if 0 else 3 # 0 or max(5, 3) if 0 else 3

19
uncompyle6/parsers/parse27.py
View File

@@ -112,14 +112,14 @@ class Python27Parser(Python2Parser):
compare_chained2 ::= expr COMPARE_OP return_lambda compare_chained2 ::= expr COMPARE_OP return_lambda
compare_chained2 ::= expr COMPARE_OP return_lambda compare_chained2 ::= expr COMPARE_OP return_lambda
# conditional_true are for conditions which always evaluate true # if_expr_true are for conditions which always evaluate true
# There is dead or non-optional remnants of the condition code though, # There is dead or non-optional remnants of the condition code though,
# and we use that to match on to reconstruct the source more accurately. # and we use that to match on to reconstruct the source more accurately.
# FIXME: we should do analysis and reduce *only* if there is dead code? # FIXME: we should do analysis and reduce *only* if there is dead code?
# right now we check that expr is "or". Any other nodes types? # right now we check that expr is "or". Any other nodes types?
expr ::= conditional_true expr ::= if_expr_true
conditional_true ::= expr JUMP_FORWARD expr COME_FROM if_expr_true ::= expr JUMP_FORWARD expr COME_FROM
conditional ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM conditional ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM
conditional ::= expr jmp_false expr JUMP_ABSOLUTE expr conditional ::= expr jmp_false expr JUMP_ABSOLUTE expr
@@ -181,9 +181,9 @@ class Python27Parser(Python2Parser):
# Common with 2.6 # Common with 2.6
return_if_lambda ::= RETURN_END_IF_LAMBDA COME_FROM return_if_lambda ::= RETURN_END_IF_LAMBDA COME_FROM
stmt ::= conditional_lambda stmt ::= if_expr_lambda
stmt ::= conditional_not_lambda stmt ::= conditional_not_lambda
conditional_lambda ::= expr jmp_false expr return_if_lambda if_expr_lambda ::= expr jmp_false expr return_if_lambda
return_stmt_lambda LAMBDA_MARKER return_stmt_lambda LAMBDA_MARKER
conditional_not_lambda conditional_not_lambda
::= expr jmp_true expr return_if_lambda ::= expr jmp_true expr return_if_lambda
@@ -216,7 +216,7 @@ class Python27Parser(Python2Parser):
self.check_reduce['raise_stmt1'] = 'AST' self.check_reduce['raise_stmt1'] = 'AST'
self.check_reduce['list_if_not'] = 'AST' self.check_reduce['list_if_not'] = 'AST'
self.check_reduce['list_if'] = 'AST' self.check_reduce['list_if'] = 'AST'
self.check_reduce['conditional_true'] = 'AST' self.check_reduce['if_expr_true'] = 'tokens'
self.check_reduce['whilestmt'] = 'tokens' self.check_reduce['whilestmt'] = 'tokens'
return return
@@ -268,11 +268,8 @@ class Python27Parser(Python2Parser):
while (tokens[i] != 'JUMP_BACK'): while (tokens[i] != 'JUMP_BACK'):
i -= 1 i -= 1
return tokens[i].attr != tokens[i-1].attr return tokens[i].attr != tokens[i-1].attr
# elif rule[0] == ('conditional_true'): elif rule[0] == 'if_expr_true':
# # FIXME: the below is a hack: we check expr for return (first) > 0 and tokens[first-1] == 'POP_JUMP_IF_FALSE'
# # nodes that could have possibly been a been a Boolean.
# # We should also look for the presence of dead code.
# return ast[0] == 'expr' and ast[0] == 'or'
return False return False

14
uncompyle6/parsers/parse3.py
View File

@@ -324,9 +324,9 @@ class Python3Parser(PythonParser):
def p_stmt3(self, args): def p_stmt3(self, args):
""" """
stmt ::= conditional_lambda stmt ::= if_expr_lambda
stmt ::= conditional_not_lambda stmt ::= conditional_not_lambda
conditional_lambda ::= expr jmp_false expr return_if_lambda if_expr_lambda ::= expr jmp_false expr return_if_lambda
return_stmt_lambda LAMBDA_MARKER return_stmt_lambda LAMBDA_MARKER
conditional_not_lambda conditional_not_lambda
::= expr jmp_true expr return_if_lambda ::= expr jmp_true expr return_if_lambda
@@ -406,11 +406,11 @@ class Python3Parser(PythonParser):
# a JUMP_ABSOLUTE with no COME_FROM # a JUMP_ABSOLUTE with no COME_FROM
conditional ::= expr jmp_false expr jump_absolute_else expr conditional ::= expr jmp_false expr jump_absolute_else expr
# conditional_true are for conditions which always evaluate true # if_expr_true are for conditions which always evaluate true
# There is dead or non-optional remnants of the condition code though, # There is dead or non-optional remnants of the condition code though,
# and we use that to match on to reconstruct the source more accurately # and we use that to match on to reconstruct the source more accurately
expr ::= conditional_true expr ::= if_expr_true
conditional_true ::= expr JUMP_FORWARD expr COME_FROM if_expr_true ::= expr JUMP_FORWARD expr COME_FROM
""" """
@staticmethod @staticmethod
@@ -584,9 +584,9 @@ class Python3Parser(PythonParser):
stmt ::= assign2_pypy stmt ::= assign2_pypy
assign3_pypy ::= expr expr expr store store store assign3_pypy ::= expr expr expr store store store
assign2_pypy ::= expr expr store store assign2_pypy ::= expr expr store store
stmt ::= conditional_lambda stmt ::= if_expr_lambda
stmt ::= conditional_not_lambda stmt ::= conditional_not_lambda
conditional_lambda ::= expr jmp_false expr return_if_lambda if_expr_lambda ::= expr jmp_false expr return_if_lambda
return_lambda LAMBDA_MARKER return_lambda LAMBDA_MARKER
conditional_not_lambda conditional_not_lambda
::= expr jmp_true expr return_if_lambda ::= expr jmp_true expr return_if_lambda

16
uncompyle6/semantics/consts.py
View File

@@ -95,7 +95,7 @@ PRECEDENCE = {
'conditional_lamdba': 28, 'conditional_lamdba': 28,
'conditional_not_lamdba': 28, 'conditional_not_lamdba': 28,
'conditionalnot': 28, 'conditionalnot': 28,
'conditional_true': 28, 'if_expr_true': 28,
'ret_cond': 28, 'ret_cond': 28,
'_mklambda': 30, '_mklambda': 30,
@@ -288,19 +288,19 @@ TABLE_DIRECT = {
'and2': ( '%c', 3 ), 'and2': ( '%c', 3 ),
'or': ( '%c or %c', 0, 2 ), 'or': ( '%c or %c', 0, 2 ),
'ret_or': ( '%c or %c', 0, 2 ), 'ret_or': ( '%c or %c', 0, 2 ),
'conditional': ( '%p if %p else %p', (2, 27), (0, 27), (4, 27) ), 'conditional': ( '%p if %c else %c',
'conditional_true': ( '%p if 1 else %p', (0, 27), (2, 27) ), (2, 'expr', 27), 0, 4 ),
'if_expr_lambda': ( '%p if %c else %c',
(2, 'expr', 27), (0, 'expr'), 4 ),
'if_expr_true': ( '%p if 1 else %c', (0, 'expr', 27), 2 ),
'ret_cond': ( '%p if %p else %p', (2, 27), (0, 27), (-1, 27) ), 'ret_cond': ( '%p if %p else %p', (2, 27), (0, 27), (-1, 27) ),
'conditional_not': ( '%p if not %p else %p', 'conditional_not': ( '%p if not %p else %p',
(2, 27), (2, 27),
(0, "expr", PRECEDENCE['unary_not']), (0, "expr", PRECEDENCE['unary_not']),
(4, 27) ), (4, 27) ),
'conditional_lambda':
( '%c if %c else %c',
(2, 'expr'), 0, 4 ),
'conditional_not_lambda': 'conditional_not_lambda':
( '%c if not %c else %c', ( '%p if not %c else %c',
(2, 'expr'), 0, 4 ), (2, 'expr', 27), 0, 4 ),
'compare_single': ( '%p %[-1]{pattr.replace("-", " ")} %p', (0, 19), (1, 19) ), 'compare_single': ( '%p %[-1]{pattr.replace("-", " ")} %p', (0, 19), (1, 19) ),
'compare_chained': ( '%p %p', (0, 29), (1, 30)), 'compare_chained': ( '%p %p', (0, 29), (1, 30)),

2
uncompyle6/semantics/helper.py
View File

@@ -50,7 +50,7 @@ def find_globals_and_nonlocals(node, globs, nonlocals, code, version):
# # print("XXX", n.kind, global_ops) # # print("XXX", n.kind, global_ops)
# if isinstance(n, SyntaxTree): # if isinstance(n, SyntaxTree):
# # FIXME: do I need a caser for n.kind="mkfunc"? # # FIXME: do I need a caser for n.kind="mkfunc"?
# if n.kind in ("conditional_lambda", "return_lambda"): # if n.kind in ("if_expr_lambda", "return_lambda"):
# globs = find_globals(n, globs, mklambda_globals) # globs = find_globals(n, globs, mklambda_globals)
# else: # else:
# globs = find_globals(n, globs, global_ops) # globs = find_globals(n, globs, global_ops)