tryparse should still throw an exception on invalid base

Author: stevengj

base/gmp.jl

@@ -84,8 +84,7 @@ function tryparse_internal(::Type{BigInt}, s::AbstractString, startpos::Int, end
 
     sgn, base, i = Base.parseint_preamble(true,base,bstr,start(bstr),endof(bstr))
     if !(2 <= base <= 62)
-        raise && throw(ArgumentError("invalid base: base must be 2 ≤ base ≤ 62, got $base"))
-        return _n
+        throw(ArgumentError("invalid base: base must be 2 ≤ base ≤ 62, got $base"))
     end
     if i == 0
         raise && throw(ArgumentError("premature end of integer: $(repr(bstr))"))

base/parse.jl

@@ -63,8 +63,7 @@ function tryparse_internal{T<:Integer}(::Type{T}, s::AbstractString, startpos::I
     _n = Nullable{T}()
     sgn, base, i = parseint_preamble(T<:Signed, base, s, startpos, endpos)
     if !(2 <= base <= 62)
-        raise && throw(ArgumentError("invalid base: base must be 2 ≤ base ≤ 62, got $base"))
-        return _n
+        throw(ArgumentError("invalid base: base must be 2 ≤ base ≤ 62, got $base"))
     end
     if i == 0
         raise && throw(ArgumentError("premature end of integer: $(repr(SubString(s,startpos,endpos)))"))

test/parse.jl

@@ -538,5 +538,9 @@ end
 @test_throws ArgumentError parse(Int, "2", 1)
 @test_throws ArgumentError parse(Int, "2", 63)
 
+# tryparse should still throw on invalid base
+@test_throws ArgumentError tryparse(Int32, "0", 1)
+@test_throws ArgumentError tryparse(BigInt, "0", 1)
+
 # error throwing branch from #10560
 @test_throws ArgumentError Base.tryparse_internal(Bool, "foo", 1, 2, 10, true)