Merge pull request beeware#526 from shortdiv/testing-branch

fix: Added fix for lshift and rshift
kunparekh18 · May 24, 2017 · 2f22821 · 2f22821
2 parents d957318 + a271740
commit 2f22821
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/batavia/types/Bool.js b/batavia/types/Bool.js
@@ -519,6 +519,12 @@ Bool.prototype.__lshift__ = function(other) {
  return new types.Int(0)
  }
  } else if (types.isinstance(other, types.Int)) {
+ if (other.valueOf() < 0) {
+ throw new exceptions.ValueError.$pyclass('negative shift count')
+ }
+ if (Number.MAX_SAFE_INTEGER < other.valueOf()) {
+ throw new exceptions.OverflowError.$pyclass('Python int too large to convert to C ssize_t')
+ }
  if (this.valueOf()) {
  this_bool = 1
  } else {
@@ -540,6 +546,12 @@ Bool.prototype.__rshift__ = function(other) {
  return new types.Int(0)
  }
  } else if (types.isinstance(other, types.Int)) {
+ if (other.valueOf() < 0) {
+ throw new exceptions.ValueError.$pyclass('negative shift count')
+ }
+ if (Number.MAX_SAFE_INTEGER < Math.abs(other.valueOf())) {
+ throw new exceptions.OverflowError.$pyclass('Python int too large to convert to C ssize_t')
+ }
  if (this.valueOf()) {
  this_bool = 1
  } else {

diff --git a/tests/datatypes/test_bool.py b/tests/datatypes/test_bool.py
@@ -27,22 +27,13 @@ class BinaryBoolOperationTests(BinaryOperationTestCase, TranspileTestCase):
  data_type = 'bool'
 
  not_implemented = [
- 'test_lshift_int',
-
- 'test_rshift_int',
-
- 'test_true_divide_complex',
+ 'test_true_divide_complex'
  ]
 
 
 class InplaceBoolOperationTests(InplaceOperationTestCase, TranspileTestCase):
  data_type = 'bool'
 
  not_implemented = [
-
- 'test_lshift_int',
-
- 'test_rshift_int',
-
  'test_true_divide_complex',
  ]
diff --git a/tests/datatypes/test_int.py b/tests/datatypes/test_int.py
@@ -93,9 +93,6 @@ class InplaceIntOperationTests(InplaceOperationTestCase, TranspileTestCase):
  'test_power_complex',
  'test_power_float',
 
- 'test_rshift_int', # this works, but some of the cases are too large
- # until we replace bignumber.js
-
  'test_subtract_complex',
 
  'test_true_divide_complex',

diff --git a/tests/utils.py b/tests/utils.py
@@ -1170,7 +1170,7 @@ def assertInplaceOperation(self, x_values, y_values, operation, format, substitu
  'test_lshift_%s' % datatype, 'x <<= y', examples, small_ints=True
  )
  vars()['test_rshift_%s' % datatype] = _inplace_test(
- 'test_rshift_%s' % datatype, 'x >>= y', examples
+ 'test_rshift_%s' % datatype, 'x >>= y', examples, small_ints=True
  )
  vars()['test_and_%s' % datatype] = _inplace_test(
  'test_and_%s' % datatype, 'x &= y', examples