Commitdfc73b5

authored

GH-95921: Fix positions for some chained comparisons (GH-96968)

1 parent8563966 commitdfc73b5Copy full SHA for dfc73b5

File tree

+28

-0

lines changed

+28

-0

lines changed

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1077,6 +1077,31 @@ def aug():`
`1077`	`1077`	`check_op_count(aug,"STORE_SLICE",1)`
`1078`	`1078`	`check_op_count(aug,"BUILD_SLICE",0)`
`1079`	`1079`
	`1080`	`+deftest_compare_positions(self):`
	`1081`	`+foropname,opin [`
	`1082`	`+ ("COMPARE_OP","<"),`
	`1083`	`+ ("COMPARE_OP","<="),`
	`1084`	`+ ("COMPARE_OP",">"),`
	`1085`	`+ ("COMPARE_OP",">="),`
	`1086`	`+ ("CONTAINS_OP","in"),`
	`1087`	`+ ("CONTAINS_OP","not in"),`
	`1088`	`+ ("IS_OP","is"),`
	`1089`	`+ ("IS_OP","is not"),`
	`1090`	`+ ]:`
	`1091`	`+expr=f'a{op} b{op} c'`
	`1092`	`+expected_positions=2* [(2,2,0,len(expr))]`
	`1093`	`+forsourcein [`
	`1094`	`+f"\\\n{expr}",f'if\\\n{expr}: x',f"x if\\\n{expr} else y"`
	`1095`	`+ ]:`
	`1096`	`+code=compile(source,"<test>","exec")`
	`1097`	`+actual_positions= [`
	`1098`	`+instruction.positions`
	`1099`	`+forinstructionindis.get_instructions(code)`
	`1100`	`+ifinstruction.opname==opname`
	`1101`	`+ ]`
	`1102`	`+withself.subTest(source):`
	`1103`	`+self.assertEqual(actual_positions,expected_positions)`
	`1104`	`+`
`1080`	`1105`
`1081`	`1106`	`@requires_debug_ranges()`
`1082`	`1107`	`classTestSourcePositions(unittest.TestCase):`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix overly-broad source position information for chained comparisons used as`
	`2`	`+branching conditions.`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2905,6 +2905,7 @@ compiler_jump_if(struct compiler *c, expr_ty e, jump_target_label next, int cond`
`2905`	`2905`	`return1;`
`2906`	`2906`	`}`
`2907`	`2907`	`caseCompare_kind: {`
	`2908`	`+SET_LOC(c,e);`
`2908`	`2909`	`Py_ssize_ti,n=asdl_seq_LEN(e->v.Compare.ops)-1;`
`2909`	`2910`	`if (n>0) {`
`2910`	`2911`	`if (!check_compare(c,e)) {`

Comments

(0)