Commit6c8584c

authored

Merge pull requestRustPython#564 from alexpantyukhin/int_shifts

add overflow errors for int shifts.

2 parents9404c7c +70ad78e commit6c8584cCopy full SHA for 6c8584c

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+fromtestutilsimportassert_raises`
	`2`	`+`
`1`	`3`	`# int to int comparisons`
`2`	`4`
`3`	`5`	`assert1==1`
`@@ -36,6 +38,7 @@`
`36`	`38`	`assert (1).real==1`
`37`	`39`	`assert (1).imag==0`
`38`	`40`
	`41`	`+assert_raises(OverflowError,lambda:1<<10**100000)`
`39`	`42`
`40`	`43`	`assert (1).__eq__(1.0)==NotImplemented`
`41`	`44`	`assert (1).__ne__(1.0)==NotImplemented`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -246,8 +246,7 @@ fn int_lshift(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`246`	`246`	`matchget_value(i2){`
`247`	`247`	`ref vif*v <BigInt::zero() =>Err(vm.new_value_error("negative shift count".to_string())),`
`248`	`248`	`ref vif*v >BigInt::from(usize::max_value()) =>{`
`249`		`-// TODO: raise OverflowError`
`250`		`-panic!("Failed converting {} to rust usize", get_value(i2));`
	`249`	`+Err(vm.new_overflow_error("the number is too large to convert to int".to_string()))`
`251`	`250`	`}`
`252`	`251`	`_ =>panic!("Failed converting {} to rust usize", get_value(i2)),`
`253`	`252`	`}`
`@@ -276,8 +275,7 @@ fn int_rshift(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`276`	`275`	`matchget_value(i2){`
`277`	`276`	`ref vif*v <BigInt::zero() =>Err(vm.new_value_error("negative shift count".to_string())),`
`278`	`277`	`ref vif*v >BigInt::from(usize::max_value()) =>{`
`279`		`-// TODO: raise OverflowError`
`280`		`-panic!("Failed converting {} to rust usize", get_value(i2));`
	`278`	`+Err(vm.new_overflow_error("the number is too large to convert to int".to_string()))`
`281`	`279`	`}`
`282`	`280`	`_ =>panic!("Failed converting {} to rust usize", get_value(i2)),`
`283`	`281`	`}`

Comments

(0)