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

cmp -> compare ...

Browse Source 
to better match the Python AST name Compare.
This forces us to change compare -> compare_single

Relates to Issue #29
This commit is contained in:
rocky
2017-11-24 07:15:37 -05:00
parent 85d65e25ba
commit be5efe3e56
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
uncompyle6/parser.py
View File

@@ -438,7 +438,7 @@ class PythonParser(GenericASTBuilder):
expr ::= load_attr expr ::= load_attr
expr ::= binary_expr expr ::= binary_expr
expr ::= build_list expr ::= build_list
expr ::= cmp expr ::= compare
expr ::= mapexpr expr ::= mapexpr
expr ::= and expr ::= and
expr ::= or expr ::= or
@@ -507,9 +507,9 @@ class PythonParser(GenericASTBuilder):
# Doesn't seem to be used anymore, but other conditional_lambda's are # Doesn't seem to be used anymore, but other conditional_lambda's are
# conditional_lambda ::= expr jmp_false return_if_stmt return_stmt LAMBDA_MARKER # conditional_lambda ::= expr jmp_false return_if_stmt return_stmt LAMBDA_MARKER
cmp ::= compare_chained compare ::= compare_chained
cmp ::= compare compare ::= compare_single
compare ::= expr expr COMPARE_OP compare_single ::= expr expr COMPARE_OP
# A compare_chained is two comparisions like x <= y <= z # A compare_chained is two comparisions like x <= y <= z
compare_chained ::= expr compare_chained1 ROT_TWO POP_TOP _come_from compare_chained ::= expr compare_chained1 ROT_TWO POP_TOP _come_from

4
uncompyle6/semantics/consts.py
View File

@@ -192,7 +192,7 @@ TABLE_DIRECT = {
'ret_cond_not': ( '%p if not %p else %p', (2, 27), (0, 22), (-1, 27) ), 'ret_cond_not': ( '%p if not %p else %p', (2, 27), (0, 22), (-1, 27) ),
'conditional_lambda': ( '%c if %c else %c', 2, 0, 4), 'conditional_lambda': ( '%c if %c else %c', 2, 0, 4),
'compare': ( '%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)),
'compare_chained1': ( '%[3]{pattr} %p %p', (0, 19), (-2, 19)), 'compare_chained1': ( '%[3]{pattr} %p %p', (0, 19), (-2, 19)),
'compare_chained2': ( '%[1]{pattr} %p', (0, 19)), 'compare_chained2': ( '%[1]{pattr} %p', (0, 19)),
@@ -340,7 +340,7 @@ PRECEDENCE = {
'BINARY_OR': 18, 'BINARY_OR': 18,
'cmp': 20, 'compare': 20,
'unary_not': 22, 'unary_not': 22,