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 23, 2016 · 32a08c7 · 32a08c7
1 parent f9e34c3
commit 32a08c7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 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
@@ -3126,7 +3126,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
@@ -276,9 +276,9 @@ for S in TestTypes, T in TestTypes
         @test isequal(Nullable(u), Nullable(u)) === true
         @test isequal(Nullable(v), Nullable(v)) === true
 
-        @test isequal(Nullable(u), Nullable(v, true)) === false
-        @test isequal(Nullable(u, true), Nullable(v)) === false
-        @test isequal(Nullable(u, true), Nullable(v, true)) === true
+        @test isequal(Nullable(u), Nullable(v, false)) === false
+        @test isequal(Nullable(u, false), Nullable(v)) === false
+        @test isequal(Nullable(u, false), Nullable(v, false)) === true
 
         @test isequal(Nullable(u), Nullable{T}()) === false
         @test isequal(Nullable{S}(), Nullable(v)) === false
@@ -296,9 +296,9 @@ for S in TestTypes, T in TestTypes
             @test isless(Nullable(u), Nullable(u)) === false
             @test isless(Nullable(v), Nullable(v)) === false
 
-            @test isless(Nullable(u), Nullable(v, true)) === true
-            @test isless(Nullable(u, true), Nullable(v)) === false
-            @test isless(Nullable(u, true), Nullable(v, true)) === false
+            @test isless(Nullable(u), Nullable(v, false)) === true
+            @test isless(Nullable(u, false), Nullable(v)) === false
+            @test isless(Nullable(u, false), Nullable(v, false)) === false
 
             @test isless(Nullable(u), Nullable{T}()) === true
             @test isless(Nullable{S}(), Nullable(v)) === false