py: fix GoInt and GoInt64 for BigInts

ncw · ncw · commit eb7e8f366d98 · 2015-06-29T21:18:00.000+01:00
diff --git a/py/bigint.go b/py/bigint.go
@@ -97,30 +97,26 @@ func (x *BigInt) MaybeInt() Object {
 	return i
 }
 
-// Truncates to go int64
+// Truncates to go int
 //
-// If it is outside the range of an go int64 it will return an error
-func (x *BigInt) GoInt() (int64, error) {
+// If it is outside the range of an go int it will return an error
+func (x *BigInt) GoInt() (int, error) {
 	z, err := x.Int()
 	if err != nil {
 		return 0, err
 	}
-	return int64(z), nil
+	return z.GoInt()
 }
 
-// Truncates to go int
+// Truncates to go int64
 //
-// If it is outside the range of an go int it will return an error
-func (x *BigInt) GoInt64() (int, error) {
+// If it is outside the range of an go int64 it will return an error
+func (x *BigInt) GoInt64() (int64, error) {
 	z, err := x.Int()
 	if err != nil {
-		return 0, overflowErrorGo
-	}
-	r := int(z)
-	if Int(r) != z {
-		return 0, overflowErrorGo
+		return 0, err
 	}
-	return int(r), nil
+	return int64(z), nil
 }
 
 // Frexp produces frac and exp such that a ~= frac × 2**exp
@@ -589,3 +585,5 @@ var _ conversionBetweenTypes = (*BigInt)(nil)
 var _ I__bool__ = (*BigInt)(nil)
 var _ I__index__ = (*BigInt)(nil)
 var _ richComparison = (*BigInt)(nil)
+var _ IGoInt = (*BigInt)(nil)
+var _ IGoInt64 = (*BigInt)(nil)
diff --git a/py/int.go b/py/int.go
@@ -712,3 +712,5 @@ var _ conversionBetweenTypes = Int(0)
 var _ I__bool__ = Int(0)
 var _ I__index__ = Int(0)
 var _ richComparison = Int(0)
+var _ IGoInt = Int(0)
+var _ IGoInt64 = Int(0)
