py: int - fix base conversion with base and sigil

ncw · ncw · commit 132a9f522a7c · 2015-07-01T18:12:56.000+01:00
diff --git a/py/int.go b/py/int.go
@@ -101,7 +101,7 @@ func IntFromString(str string, base int) (Object, error) {
 		}
 	}
 
-	// Get rid of leading sigils and set base
+	// Get rid of leading sigils and set convertBase
 	if len(s) > 1 && s[0] == '0' {
 		switch s[1] {
 		case 'x', 'X':
@@ -115,7 +115,9 @@ func IntFromString(str string, base int) (Object, error) {
 		}
 		if base != 0 && base != convertBase {
 			// int("0xFF", 10)
-			goto error
+			// int("0b", 16)
+			convertBase = base // ignore sigil
+			goto nosigil
 		}
 		s = s[2:]
 		if len(s) == 0 {
@@ -161,7 +163,7 @@ func IntFromString(str string, base int) (Object, error) {
 	}
 	return (*BigInt)(x).MaybeInt(), nil
 error:
-	return nil, ExceptionNewf(ValueError, "invalid literal for int() with base %d: '%s'", base, str)
+	return nil, ExceptionNewf(ValueError, "invalid literal for int() with base %d: '%s'", convertBase, str)
 }
 
 // Truncates to go int
diff --git a/py/tests/int.py b/py/tests/int.py
@@ -104,6 +104,7 @@
 assert int("F", 16) == 15
 assert int("0xF", 16) == 15
 assert int("0XF", 0) == 15
+assert int("0b", 16) == 11
 assertRaises(ValueError, int, "0xF", 10)
 
 assert int("77", 8) == 63

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func IntFromString(str string, base int) (Object, error) {`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- // Get rid of leading sigils and set base`
	`104`	`+ // Get rid of leading sigils and set convertBase`
`105`	`105`	`if len(s) > 1 && s[0] == '0' {`
`106`	`106`	`switch s[1] {`
`107`	`107`	`case 'x', 'X':`
`@@ -115,7 +115,9 @@ func IntFromString(str string, base int) (Object, error) {`
`115`	`115`	`}`
`116`	`116`	`if base != 0 && base != convertBase {`
`117`	`117`	`// int("0xFF", 10)`
`118`		`- goto error`
	`118`	`+ // int("0b", 16)`
	`119`	`+ convertBase = base // ignore sigil`
	`120`	`+ goto nosigil`
`119`	`121`	`}`
`120`	`122`	`s = s[2:]`
`121`	`123`	`if len(s) == 0 {`
`@@ -161,7 +163,7 @@ func IntFromString(str string, base int) (Object, error) {`
`161`	`163`	`}`
`162`	`164`	`return (*BigInt)(x).MaybeInt(), nil`
`163`	`165`	`error:`
`164`		`- return nil, ExceptionNewf(ValueError, "invalid literal for int() with base %d: '%s'", base, str)`
	`166`	`+ return nil, ExceptionNewf(ValueError, "invalid literal for int() with base %d: '%s'", convertBase, str)`
`165`	`167`	`}`
`166`	`168`
`167`	`169`	`// Truncates to go int`