Merge pull request #9 from davidanthoff/lifting

Add support for . lifting

Author: davidanthoff

src/DataValues.jl

@@ -78,11 +78,12 @@ get(x::DataValue) = isnull(x) ? throw(DataValueException()) : x.value
 get(x::DataValue{Union{}}) = throw(DataValueException())
 get(x::DataValue{Union{}}, y) = y
 
-unsafe_get(x::DataValue) = x.value
-unsafe_get(x) = x
+Base.unsafe_get(x::DataValue) = x.value
 
 isnull(x::DataValue) = !x.hasvalue
 
+Base.hasvalue(x::DataValue) = x.hasvalue
+
 const DataValuehash_seed = UInt === UInt64 ? 0x932e0143e51d0171 : 0xe51d0171
 
 function hash(x::DataValue, h::UInt)
@@ -235,4 +236,6 @@ function isless{S,T}(x::DataValue{S}, y::DataValue{T})
     end
 end
 
+include("broadcast.jl")
+
 end

src/broadcast.jl

@@ -0,0 +1,31 @@
+Base.Broadcast._containertype(::Type{<:DataValue}) = DataValue
+
+Base.Broadcast.promote_containertype(::Type{Any}, ::Type{DataValue}) = DataValue
+Base.Broadcast.promote_containertype(::Type{DataValue}, ::Type{Any}) = DataValue
+Base.Broadcast.promote_containertype(::Type{Tuple}, ::Type{DataValue}) = Tuple
+Base.Broadcast.promote_containertype(::Type{DataValue}, ::Type{Tuple}) = Tuple
+Base.Broadcast.promote_containertype(::Type{DataValue}, ::Type{Nullable}) = DataValue
+Base.Broadcast.promote_containertype(::Type{Nullable}, ::Type{DataValue}) = DataValue
+
+Base.Broadcast.broadcast_indices(::Type{DataValue}, A) = ()
+
+Base.Broadcast._unsafe_get_eltype(x::DataValue) = eltype(x)
+
+Base.Broadcast._broadcast_getindex_eltype(::Type{DataValue}, T::Type) = Type{T}
+Base.Broadcast._broadcast_getindex_eltype(::Type{DataValue}, A) = typeof(A)
+
+Base.@propagate_inbounds Base.Broadcast._broadcast_getindex(::Type{DataValue}, A, I) = A
+
+@inline function Base.Broadcast.broadcast_c(f, ::Type{DataValue}, a...)
+    nonnull = all(Base.hasvalue, a)
+    S = Base.Broadcast._nullable_eltype(f, a...)
+    if isleaftype(S) && Base.null_safe_op(f, Base.Broadcast.maptoTuple(Base.Broadcast._unsafe_get_eltype,a...).types...)
+        DataValue{S}(f(map(unsafe_get, a)...), nonnull)
+    else
+        if nonnull
+            DataValue(f(map(unsafe_get, a)...))
+        else
+            DataValue{Base.nullable_returntype(S)}()
+        end
+    end
+end