chained-compare1 -> chained-compare-middle

This commit is contained in:
rocky
2023-07-29 12:01:14 -04:00
parent ea76de02bd
commit 843e3585e2
8 changed files with 90 additions and 79 deletions

View File

@@ -338,7 +338,7 @@ TABLE_DIRECT = {
"if_exp_not_lambda": ("%p if not %c else %c", (2, "expr", 27), 0, 4),
"compare_single": ('%p %[-1]{pattr.replace("-", " ")} %p', (0, 19), (1, 19)),
"compare_chained": ("%p %p", (0, 29), (1, 30)),
"compare_chained1": ('%[3]{pattr.replace("-", " ")} %p %p', (0, 19), (-2, 19)),
"compared_chained_middle": ('%[3]{pattr.replace("-", " ")} %p %p', (0, 19), (-2, 19)),
"compare_chained2": ('%[1]{pattr.replace("-", " ")} %p', (0, 19)),
# "classdef": (), # handled by n_classdef()
# A custom rule in n_function def distinguishes whether to call this or

View File

@@ -99,12 +99,12 @@ def customize_for_version37(self, version):
"await_stmt": ("%|%c\n", 0),
"c_async_with_stmt": ("%|async with %c:\n%+%c%-", (0, "expr"), 3),
"call_ex": ("%c(%p)", (0, "expr"), (1, 100)),
"compare_chained1a_37": (
"compared_chained_middlea_37": (
' %[3]{pattr.replace("-", " ")} %p %p',
(0, PRECEDENCE["compare"] - 1),
(-4, PRECEDENCE["compare"] - 1),
),
"compare_chained1_false_37": (
"compared_chained_middle_false_37": (
' %[3]{pattr.replace("-", " ")} %p %p',
(0, PRECEDENCE["compare"] - 1),
(-4, PRECEDENCE["compare"] - 1),
@@ -114,12 +114,12 @@ def customize_for_version37(self, version):
(0, PRECEDENCE["compare"] - 1),
(-5, PRECEDENCE["compare"] - 1),
),
"compare_chained1b_false_37": (
"compared_chained_middleb_false_37": (
' %[3]{pattr.replace("-", " ")} %p %p',
(0, PRECEDENCE["compare"] - 1),
(-4, PRECEDENCE["compare"] - 1),
),
"compare_chained1c_37": (
"compared_chained_middlec_37": (
' %[3]{pattr.replace("-", " ")} %p %p',
(0, PRECEDENCE["compare"] - 1),
(-2, PRECEDENCE["compare"] - 1),
@@ -461,12 +461,12 @@ def customize_for_version37(self, version):
compare_chained37 = node[0]
if (
compare_chained37 == "compare_chained37"
and compare_chained37[1] == "compare_chained1b_37"
and compare_chained37[1] == "compared_chained_middleb_37"
):
compare_chained1b_37 = compare_chained37[1]
compared_chained_middleb_37 = compare_chained37[1]
if (
len(compare_chained1b_37) > 2
and compare_chained1b_37[-2] == "JUMP_FORWARD"
len(compared_chained_middleb_37) > 2
and compared_chained_middleb_37[-2] == "JUMP_FORWARD"
):
node.kind = "testfalse"
pass