diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py index 415d78d4..17a4f34f 100644 --- a/uncompyle6/parser.py +++ b/uncompyle6/parser.py @@ -438,7 +438,7 @@ class PythonParser(GenericASTBuilder): expr ::= load_attr expr ::= binary_expr expr ::= build_list - expr ::= cmp + expr ::= compare expr ::= mapexpr expr ::= and expr ::= or @@ -507,9 +507,9 @@ class PythonParser(GenericASTBuilder): # 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 - cmp ::= compare_chained - cmp ::= compare - compare ::= expr expr COMPARE_OP + compare ::= compare_chained + compare ::= compare_single + compare_single ::= expr expr COMPARE_OP # A compare_chained is two comparisions like x <= y <= z compare_chained ::= expr compare_chained1 ROT_TWO POP_TOP _come_from diff --git a/uncompyle6/semantics/consts.py b/uncompyle6/semantics/consts.py index ab87fded..97a9455c 100644 --- a/uncompyle6/semantics/consts.py +++ b/uncompyle6/semantics/consts.py @@ -192,7 +192,7 @@ TABLE_DIRECT = { '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), - '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_chained1': ( '%[3]{pattr} %p %p', (0, 19), (-2, 19)), 'compare_chained2': ( '%[1]{pattr} %p', (0, 19)), @@ -340,7 +340,7 @@ PRECEDENCE = { 'BINARY_OR': 18, - 'cmp': 20, + 'compare': 20, 'unary_not': 22,