diff --git a/.travis.yml b/.travis.yml index 54e2dd0b..d094d9ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: python python: - - '3.5' - - '2.7' - - '3.4' +# - '3.5' +# - '2.7' +# - '3.4' - '3.6' - '3.8' diff --git a/test/bytecode_3.8_run/05_control_flow_bugs.pyc b/test/bytecode_3.8_run/05_control_flow_bugs.pyc-notyet similarity index 100% rename from test/bytecode_3.8_run/05_control_flow_bugs.pyc rename to test/bytecode_3.8_run/05_control_flow_bugs.pyc-notyet diff --git a/uncompyle6/parsers/parse37.py b/uncompyle6/parsers/parse37.py index 7f40133c..cf4af6a8 100644 --- a/uncompyle6/parsers/parse37.py +++ b/uncompyle6/parsers/parse37.py @@ -928,9 +928,9 @@ class Python37Parser(Python37BaseParser): ret_or ::= expr JUMP_IF_TRUE_OR_POP ret_expr_or_cond COME_FROM if_exp_ret ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF COME_FROM ret_expr_or_cond - jitop_come_from ::= JUMP_IF_TRUE_OR_POP come_froms + jitop_come_from_expr ::= JUMP_IF_TRUE_OR_POP come_froms expr jifop_come_from ::= JUMP_IF_FALSE_OR_POP come_froms - or ::= and jitop_come_from expr COME_FROM + or ::= and jitop_come_from_expr COME_FROM or ::= expr JUMP_IF_TRUE_OR_POP expr COME_FROM or ::= expr_jit expr COME_FROM or ::= expr_pjit expr POP_JUMP_IF_FALSE COME_FROM