remove nullable method usage

JuliaLang · Mar 12, 2015 · 77a30d0 · 77a30d0
1 parent 775a908
commit 77a30d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/base/gmp.jl b/base/gmp.jl
@@ -225,7 +225,7 @@ function serialize(s, n::BigInt)
     serialize(s, base(62,n))
 end
 
-deserialize(s, ::Type{BigInt}) = get(Base.tryparse_internal(BigInt, deserialize(s), 62, true))
+deserialize(s, ::Type{BigInt}) = (Base.tryparse_internal(BigInt, deserialize(s), 62, true)).value
 
 # Binary ops
 for (fJ, fC) in ((:+, :add), (:-,:sub), (:*, :mul),

diff --git a/base/string.jl b/base/string.jl
@@ -1582,8 +1582,8 @@ function tryparse_internal{T<:Integer}(::Type{T}, s::AbstractString, base::Int,
         (T <: Signed) && (d *= sgn)
 
         safe_n = safe_mul(n, base)
-        isnull(safe_n) || (safe_n = safe_add(get(safe_n), d))
-        if isnull(safe_n)
+        safe_n.isnull || (safe_n = safe_add(safe_n.value, d))
+        if safe_n.isnull
             raise && throw(OverflowError())
             return _n
         end
@@ -1608,9 +1608,9 @@ tryparse{T<:Integer}(::Type{T}, s::AbstractString) = tryparse_internal(T,s,0)
 
 function parseint{T<:Integer}(::Type{T}, s::AbstractString, base::Integer)
     (2 <= base <= 62) || throw(ArgumentError("invalid base: base must be 2 ≤ base ≤ 62, got $base"))
-    get(tryparse_internal(T, s, base, true))
+    (tryparse_internal(T, s, base, true)).value
 end
-parseint{T<:Integer}(::Type{T}, s::AbstractString) = get(tryparse_internal(T, s, 0, true))
+parseint{T<:Integer}(::Type{T}, s::AbstractString) = (tryparse_internal(T, s, 0, true)).value
 parseint(s::AbstractString, base::Integer) = parseint(Int,s,base)
 parseint(s::AbstractString) = parseint(Int,s)
 
@@ -1628,7 +1628,7 @@ tryparse(::Type{Float32}, s::SubString) = ccall(:jl_try_substrtof, Nullable{Floa
 
 function parse{T<:Union(Float32,Float64)}(::Type{T}, s::AbstractString)
     nf = tryparse(T, s)
-    isnull(nf) ? throw(ArgumentError("invalid number format $(repr(s)) for $T")) : get(nf)
+    nf.isnull ? throw(ArgumentError("invalid number format $(repr(s)) for $T")) : nf.value
 end
 
 parsefloat{T<:Union(Float32,Float64)}(::Type{T}, s::AbstractString) = parse(T,s)
@@ -1640,8 +1640,8 @@ float{S<:AbstractString}(a::AbstractArray{S}) = map!(float, similar(a,typeof(flo
 
 function float_isvalid{T<:Union(Float32,Float64)}(s::AbstractString, out::Array{T,1})
     tf = tryparse(T, s)
-    isnull(tf) || (out[1] = get(tf))
-    !isnull(tf)
+    tf.isnull || (out[1] = tf.value)
+    !(tf.isnull)
 end
 
 float32_isvalid(s::AbstractString, out::Array{Float32,1}) = float_isvalid(s, out)