py: float and int - check for divide by zero

ncw · ncw · commit 3a897b0cab2e · 2015-05-22T17:25:46.000+01:00
diff --git a/py/float.go b/py/float.go
@@ -17,6 +17,9 @@ func (o Float) Type() *Type {
 
 // Arithmetic
 
+// Errors
+var floatDivisionByZero = ExceptionNewf(ZeroDivisionError, "float division by zero")
+
 // Convert an Object to an Float
 //
 // Retrurns ok as to whether the conversion worked or not
@@ -98,13 +101,19 @@ func (a Float) M__imul__(other Object) Object {
 
 func (a Float) M__truediv__(other Object) Object {
 	if b, ok := convertToFloat(other); ok {
+		if b == 0 {
+			panic(floatDivisionByZero)
+		}
 		return Float(a / b)
 	}
 	return NotImplemented
 }
 
 func (a Float) M__rtruediv__(other Object) Object {
 	if b, ok := convertToFloat(other); ok {
+		if a == 0 {
+			panic(floatDivisionByZero)
+		}
 		return Float(b / a)
 	}
 	return NotImplemented
@@ -134,6 +143,9 @@ func (a Float) M__ifloordiv__(other Object) Object {
 
 // Does DivMod of two floating point numbers
 func floatDivMod(a, b Float) (Float, Float) {
+	if b == 0 {
+		panic(floatDivisionByZero)
+	}
 	q := Float(math.Floor(float64(a / b)))
 	r := a - q*b
 	return q, Float(r)
diff --git a/py/int.go b/py/int.go
@@ -81,6 +81,9 @@ func IntNew(metatype *Type, args Tuple, kwargs StringDict) Object {
 
 // Arithmetic
 
+// Errors
+var divisionByZero = ExceptionNewf(ZeroDivisionError, "division by zero")
+
 // Convert an Object to an Int
 //
 // Retrurns ok as to whether the conversion worked or not
@@ -188,6 +191,9 @@ func (a Int) M__floordiv__(other Object) Object {
 
 func (a Int) M__rfloordiv__(other Object) Object {
 	if b, ok := convertToInt(other); ok {
+		if a == 0 {
+			panic(divisionByZero)
+		}
 		return Int(b / a)
 	}
 	return NotImplemented
@@ -199,13 +205,19 @@ func (a Int) M__ifloordiv__(other Object) Object {
 
 func (a Int) M__mod__(other Object) Object {
 	if b, ok := convertToInt(other); ok {
+		if b == 0 {
+			panic(divisionByZero)
+		}
 		return Int(a % b)
 	}
 	return NotImplemented
 }
 
 func (a Int) M__rmod__(other Object) Object {
 	if b, ok := convertToInt(other); ok {
+		if a == 0 {
+			panic(divisionByZero)
+		}
 		return Int(b % a)
 	}
 	return NotImplemented
@@ -217,13 +229,19 @@ func (a Int) M__imod__(other Object) Object {
 
 func (a Int) M__divmod__(other Object) (Object, Object) {
 	if b, ok := convertToInt(other); ok {
+		if b == 0 {
+			panic(divisionByZero)
+		}
 		return Int(a / b), Int(a % b)
 	}
 	return NotImplemented, None
 }
 
 func (a Int) M__rdivmod__(other Object) (Object, Object) {
 	if b, ok := convertToInt(other); ok {
+		if a == 0 {
+			panic(divisionByZero)
+		}
 		return Int(b / a), Int(b % a)
 	}
 	return NotImplemented, None
