Factor out __isub__.

All of the tests for subtraction now pass.
dranzerashi · Aug 31, 2017 · c49d8f2 · c49d8f2
1 parent edb0966
commit c49d8f2
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 62 deletions.
diff --git a/python/common/org/python/types/Bool.java b/python/common/org/python/types/Bool.java
@@ -554,24 +554,6 @@ public org.python.Object __ror__(org.python.Object other) {
 
     }
 
-    @org.python.Method(
-            __doc__ = "",
-            args = {"other"}
-    )
-    public org.python.Object __isub__(org.python.Object other) {
-        int this_val = (((org.python.types.Bool) this).value ? 1 : 0);
-        if (other instanceof org.python.types.Bool) {
-            this_val -= (((org.python.types.Bool) other).value ? 1 : 0);
-            return new org.python.types.Int(this_val);
-        } else if (other instanceof org.python.types.Int) {
-            this_val -= ((org.python.types.Int) other).value;
-            return new org.python.types.Int(this_val);
-        } else if (other instanceof org.python.types.Float) {
-            return new org.python.types.Float(this_val - ((org.python.types.Float) other).value);
-        }
-        throw new org.python.exceptions.TypeError("unsupported operand type(s) for -=: 'bool' and '" + other.typeName() + "'");
-    }
-
     @org.python.Method(
             __doc__ = "",
             args = {"other"}

diff --git a/python/common/org/python/types/Float.java b/python/common/org/python/types/Float.java
@@ -290,6 +290,11 @@ public org.python.Object __sub__(org.python.Object other) {
                 return new org.python.types.Float(this.value - 1.0);
             }
             return new org.python.types.Float(this.value);
+        } else if (other instanceof org.python.types.Complex) {
+            return new org.python.types.Complex(
+                new org.python.types.Float(this.value - ((org.python.types.Complex)other).real.value),
+                new org.python.types.Float(-((org.python.types.Complex)other).imag.value)
+            );
         }
         throw new org.python.exceptions.TypeError("unsupported operand type(s) for -: 'float' and '" + other.typeName() + "'");
     }

diff --git a/python/common/org/python/types/Int.java b/python/common/org/python/types/Int.java
@@ -751,28 +751,6 @@ public org.python.Object __ilshift__(org.python.Object other) {
         throw new org.python.exceptions.TypeError("unsupported operand type(s) for <<=: 'int' and '" + other.typeName() + "'");
     }
 
-    @org.python.Method(
-            __doc__ = "",
-            args = {"other"}
-    )
-    public org.python.Object __isub__(org.python.Object other) {
-        if (other instanceof org.python.types.Int) {
-            this.value -= ((org.python.types.Int) other).value;
-            return new org.python.types.Int(this.value);
-        } else if (other instanceof org.python.types.Float) {
-            double this_val = this.value;
-            this_val -= ((org.python.types.Float) other).value;
-            return new org.python.types.Float(this_val);
-        } else if (other instanceof org.python.types.Bool) {
-            this.value -= (((org.python.types.Bool) other).value ? 1 : 0);
-            return new org.python.types.Int(this.value);
-        } else if (other instanceof org.python.types.Complex) {
-            org.python.types.Complex other_cmplx_obj = (org.python.types.Complex) other;
-            return new org.python.types.Complex(this.value - other_cmplx_obj.real.value, -(other_cmplx_obj.imag.value));
-        }
-        throw new org.python.exceptions.TypeError("unsupported operand type(s) for -=: 'int' and '" + other.typeName() + "'");
-    }
-
     @org.python.Method(
             __doc__ = "",
             args = {"other"}

diff --git a/python/common/org/python/types/Object.java b/python/common/org/python/types/Object.java
@@ -801,8 +801,7 @@ public org.python.Object __iadd__(org.python.Object other) {
     )
     public org.python.Object __isub__(org.python.Object other) {
         try {
-            this.setValue(this.__sub__(other));
-            return this;
+            return this.__sub__(other);
         } catch (org.python.exceptions.TypeError e) {
             throw new org.python.exceptions.TypeError("unsupported operand type(s) for -=: '" + this.typeName() + "' and '" + other.typeName() + "'");
         }

diff --git a/python/common/org/python/types/Set.java b/python/common/org/python/types/Set.java
@@ -378,13 +378,6 @@ public org.python.Object __or__(org.python.Object other) {
     //     throw new org.python.exceptions.NotImplementedError("__ror__() has not been implemented");
     // }
 
-    // @org.python.Method(
-    //     __doc__ = ""
-    // )
-    // public void __isub__(org.python.Object other) {
-    //     throw new org.python.exceptions.NotImplementedError("__isub__() has not been implemented");
-    // }
-
     // @org.python.Method(
     //     __doc__ = ""
     // )

diff --git a/python/common/org/python/types/Super.java b/python/common/org/python/types/Super.java
@@ -701,8 +701,7 @@ public org.python.Object __iadd__(org.python.Object other) {
     )
     public org.python.Object __isub__(org.python.Object other) {
         try {
-            this.setValue(this.__sub__(other));
-            return this;
+            return this.__sub__(other);
         } catch (org.python.exceptions.TypeError e) {
             throw new org.python.exceptions.TypeError("unsupported operand type(s) for -=: 'super()' and '" + other.typeName() + "'");
         }

diff --git a/tests/datatypes/test_bool.py b/tests/datatypes/test_bool.py
@@ -67,8 +67,6 @@ class InplaceBoolOperationTests(InplaceOperationTestCase, TranspileTestCase):
         'test_power_float',
         'test_power_int',
 
-        'test_subtract_complex',
-
         'test_true_divide_bool',
         'test_true_divide_complex',
         'test_true_divide_float',

diff --git a/tests/datatypes/test_complex.py b/tests/datatypes/test_complex.py
@@ -264,11 +264,6 @@ class InplaceComplexOperationTests(InplaceOperationTestCase, TranspileTestCase):
         'test_subscr_str',
         'test_subscr_tuple',
 
-        'test_subtract_bool',
-        'test_subtract_complex',
-        'test_subtract_float',
-        'test_subtract_int',
-
         'test_true_divide_bool',
         'test_true_divide_complex',
         'test_true_divide_float',

diff --git a/tests/datatypes/test_float.py b/tests/datatypes/test_float.py
@@ -138,8 +138,6 @@ class BinaryFloatOperationTests(BinaryOperationTestCase, TranspileTestCase):
         'test_subscr_str',
         'test_subscr_tuple',
 
-        'test_subtract_complex',
-
         'test_true_divide_complex',
     ]
 
@@ -162,7 +160,5 @@ class InplaceFloatOperationTests(InplaceOperationTestCase, TranspileTestCase):
         'test_power_complex',
         'test_power_float',
 
-        'test_subtract_complex',
-
         'test_true_divide_complex',
     ]