Change isnull argument to Nullable() constructor to hasvalue

This method is not currently documented, and the new form is more consistent with the new structure of the type.
JuliaLang · Sep 15, 2016 · 672c01c · 672c01c
1 parent 8da3c10
commit 672c01c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/base/base.jl b/base/base.jl
@@ -150,5 +150,5 @@ immutable Nullable{T}
  value::T
 
  Nullable() = new(false)
- Nullable(value::T, isnull::Bool=false) = new(!isnull, value)
+ Nullable(value::T, hasvalue::Bool=true) = new(hasvalue, value)
 end
diff --git a/base/nullable.jl b/base/nullable.jl
@@ -3,7 +3,7 @@
 immutable NullException <: Exception
 end
 
-Nullable{T}(value::T, isnull::Bool=false) = Nullable{T}(value, isnull)
+Nullable{T}(value::T, hasvalue::Bool=true) = Nullable{T}(value, hasvalue)
 Nullable() = Nullable{Union{}}()
 
 eltype{T}(::Type{Nullable{T}}) = T

diff --git a/test/core.jl b/test/core.jl
@@ -3118,7 +3118,7 @@ f11858(Any[Type{Foo11858}, Type{Bar11858}, typeof(g11858)])
 foo11904(x::Int) = x
 @inline function foo11904{S}(x::Nullable{S})
  if isbits(S)
- Nullable(foo11904(x.value), isnull(x))
+ Nullable(foo11904(x.value), x.hasvalue)
  else
  throw_error()
  end

diff --git a/test/nullable.jl b/test/nullable.jl
@@ -40,15 +40,15 @@ for T in types
  @test eltype(x) === T
 end
 
-# Nullable{T}(value::T, isnull::Bool) = new(isnull, value)
+# Nullable{T}(value::T, hasvalue::Bool) = new(hasvalue, value)
 for T in types
- x = Nullable{T}(zero(T),false)
+ x = Nullable{T}(zero(T), true)
  @test x.hasvalue === true
  @test isa(x.value, T)
  @test x.value === zero(T)
  @test eltype(x) === T
 
- x = Nullable{T}(zero(T),true)
+ x = Nullable{T}(zero(T), false)
  @test x.hasvalue === false
  @test isa(x.value, T)
  @test eltype(Nullable{T}) === T