Don't allow the wrong prefix in BigInteger.parse when you specify a base. Fixes #10.

Author: silentmatt

biginteger.js

@@ -359,7 +359,23 @@ BigInteger.parse = function(s, base) {
 		s = expandExponential(s);
 	}
 
-	var parts = /^([+\-]?)(0[xXcCbB])?([0-9A-Za-z]*)(?:\.\d*)?$/.exec(s);
+	var prefixRE;
+	if (typeof base === "undefined") {
+		prefixRE = '0[xcb]';
+	}
+	else if (base == 16) {
+		prefixRE = '0x';
+	}
+	else if (base == 8) {
+		prefixRE = '0c';
+	}
+	else if (base == 2) {
+		prefixRE = '0b';
+	}
+	else {
+		prefixRE = '';
+	}
+	var parts = new RegExp('^([+\\-]?)(' + prefixRE + ')?([0-9a-z]*)(?:\\.\\d*)?$', 'i').exec(s);
 	if (parts) {
 		var sign = parts[1] || "+";
 		var baseSection = parts[2] || "";

test/test-biginteger.js

@@ -266,9 +266,6 @@ function testParse() {
 	n = BigInteger.parse("-0c715");
 	checkBigInteger(n, [461], -1);
 
-	n = BigInteger.parse("-0C715", 10);
-	checkBigInteger(n, [715], -1);
-
 	n = BigInteger.parse("+0b1101");
 	checkBigInteger(n, [13], 1);
 
@@ -308,6 +305,27 @@ function testParse() {
 	n = BigInteger.parse("1011", 36);
 	checkBigInteger(n, BigInteger.base_log10 === 7 ? [46693] : [6693, 4], 1);
 
+	n = BigInteger.parse("0b", 16);
+	checkBigInteger(n, [11], 1);
+
+	n = BigInteger.parse("0c", 16);
+	checkBigInteger(n, [12], 1);
+
+	n = BigInteger.parse("0b12", 16);
+	checkBigInteger(n, [2834], 1);
+
+	n = BigInteger.parse("0c12", 16);
+	checkBigInteger(n, [3090], 1);
+
+	n = BigInteger.parse("0b101", 2);
+	checkBigInteger(n, [5], 1);
+
+	n = BigInteger.parse("0c101", 8);
+	checkBigInteger(n, [65], 1);
+
+	n = BigInteger.parse("0x101", 16);
+	checkBigInteger(n, [257], 1);
+
 	BigInteger.parse("1", 2);
 	BigInteger.parse("2", 3);
 	BigInteger.parse("3", 4);
@@ -372,6 +390,13 @@ function testParseFail() {
 	assertThrows(createTest("52", 5), digitError);
 	assertThrows(createTest("23a105"), digitError);
 	assertThrows(createTest("DeadBeef", 15), digitError);
+	assertThrows(createTest("-0C715", 10), digitError);
+	assertThrows(createTest("-0x715", 10), digitError);
+	assertThrows(createTest("-0b715", 10), digitError);
+	assertThrows(createTest("-0x715", 8), digitError);
+	assertThrows(createTest("-0b715", 8), digitError);
+	assertThrows(createTest("-0C715", 2), digitError);
+	assertThrows(createTest("-0x715", 2), digitError);
 
 	assertThrows(createTest("2", 2), digitError);
 	assertThrows(createTest("3", 3), digitError);