3.6 Chained compare

2025-08-03 00:45:53 +08:00 · 2019-04-17 15:44:33 -04:00
parent 2ea8c3b1b1
commit e6e60cb49d
11 changed files with 6 additions and 1 deletions
--- a/test/bytecode_2.6/01_triple_compare.pyc
+++ b/test/bytecode_2.6/01_triple_compare.pyc
--- a/test/bytecode_2.6_run/01_triple_compare.pyc
+++ b/test/bytecode_2.6_run/01_triple_compare.pyc
--- a/test/bytecode_2.7/01_triple_compare.pyc
+++ b/test/bytecode_2.7/01_triple_compare.pyc
--- a/test/bytecode_2.7_run/01_triple_compare.pyc
+++ b/test/bytecode_2.7_run/01_triple_compare.pyc
--- a/test/bytecode_3.2/01_triple_compare.pyc
+++ b/test/bytecode_3.2/01_triple_compare.pyc
--- a/test/bytecode_3.2_run/01_triple_compare.pyc
+++ b/test/bytecode_3.2_run/01_triple_compare.pyc
--- a/test/bytecode_3.3/01_triple_compare.pyc
+++ b/test/bytecode_3.3/01_triple_compare.pyc
--- a/test/bytecode_3.3_run/01_triple_compare.pyc
+++ b/test/bytecode_3.3_run/01_triple_compare.pyc
--- a/test/bytecode_3.6_run/01_triple_compare.pyc
+++ b/test/bytecode_3.6_run/01_triple_compare.pyc
--- a/test/simple_source/bug33/01_triple_compare.py
+++ b/test/simple_source/bug33/01_triple_compare.py
@@ -1,8 +1,11 @@
 # In Python 3.3+ this uses grammar rule
 # compare_chained2 ::= expr COMPARE_OP RETURN_VALUE
+# In Python 3.6 uses this uses grammar rule
+# compare_chained2 ::= expr COMPARE_OP come_froms JUMP_FORWARD

 # Seen in Python 3.3 ipaddress.py

+# RUNNABLE!
 def _is_valid_netmask(netmask):
    return 0 <= netmask <= 10

@@ -10,4 +13,4 @@ def _is_valid_netmask(netmask):
 # detections

 # See in 2.6.9 quopri.py ishex():
-'0' <= __file__ <= '9' or 'a' <= __file__ <= 'f' or 'A' <= __file__ <= 'F'
+assert not '0' <= __file__ <= '9' or 'a' <= __file__ <= 'f' or 'A' <= __file__ <= 'F'
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -133,6 +133,8 @@ class Python36Parser(Python35Parser):
        stmt ::= tryfinally_return_stmt
        tryfinally_return_stmt ::= SETUP_FINALLY suite_stmts_opt POP_BLOCK LOAD_CONST
                                   COME_FROM_FINALLY
+
+        compare_chained2 ::= expr COMPARE_OP come_froms JUMP_FORWARD
        """

    def customize_grammar_rules(self, tokens, customize):