Commit0799a8a

authored

[mypyc] Fix unions of bools and ints (#15066)

1 parent4276308 commit0799a8aCopy full SHA for 0799a8a

File tree

+14

-1

lines changed

+14

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def visit_rinstance(self, left: RInstance) -> bool:`
`51`	`51`	`returnis_subtype(left,self.right)`
`52`	`52`
`53`	`53`	`defvisit_runion(self,left:RUnion)->bool:`
`54`		`-returnis_subtype(left,self.right)`
	`54`	`+returnnotself.right.is_unboxedandis_subtype(left,self.right)`
`55`	`55`
`56`	`56`	`defvisit_rprimitive(self,left:RPrimitive)->bool:`
`57`	`57`	`ifis_short_int_rprimitive(left)andis_int_rprimitive(self.right):`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,3 +221,9 @@ def test_mixed_comparisons_i64() -> None:`
`221`	`221`	`assert neq_mixed_i64(n, x) == (n != int(x))`
`222`	`222`	`assert lt_mixed_i64(x, n) == (int(x) < n)`
`223`	`223`	`assert gt_mixed_i64(n, x) == (n > int(x))`
	`224`	`+`
	`225`	`+[case testBoolMixInt]`
	`226`	`+y = False`
	`227`	`+print((y or 0) and True)`
	`228`	`+[out]`
	`229`	`+0`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,13 @@ def test_bool(self) -> None:`
`54`	`54`	`assertnotis_runtime_subtype(bool_rprimitive,bit_rprimitive)`
`55`	`55`	`assertnotis_runtime_subtype(bool_rprimitive,int_rprimitive)`
`56`	`56`
	`57`	`+deftest_union(self)->None:`
	`58`	`+bool_int_mix=RUnion([bool_rprimitive,int_rprimitive])`
	`59`	`+assertnotis_runtime_subtype(bool_int_mix,short_int_rprimitive)`
	`60`	`+assertnotis_runtime_subtype(bool_int_mix,int_rprimitive)`
	`61`	`+assertnotis_runtime_subtype(short_int_rprimitive,bool_int_mix)`
	`62`	`+assertnotis_runtime_subtype(int_rprimitive,bool_int_mix)`
	`63`	`+`
`57`	`64`
`58`	`65`	`classTestUnionSimplification(unittest.TestCase):`
`59`	`66`	`deftest_simple_type_result(self)->None:`

Comments

(0)