Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing support for addition and subtraction #37222

Merged
merged 6 commits into from
Aug 31, 2020
Merged

Add missing support for addition and subtraction #37222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5416a09
Add missing support for addition and subtraction
nilshg Aug 26, 2020
6e44f90
Update stdlib/Dates/src/arithmetic.jl
nilshg Aug 26, 2020
ffa2884
Add tests for missing arithmetic
nilshg Aug 26, 2020
6e7aea4
Remove trailing whitespace
nalimilan Aug 26, 2020
4d39cf4
Hardcode `DatePeriod` and `TimePeriod` subtypes
nilshg Aug 27, 2020
8631987
Update stdlib/Dates/test/arithmetic.jl
nilshg Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions stdlib/Dates/src/arithmetic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ end
(-)(x::Time, y::TimePeriod) = return Time(Nanosecond(value(x) - tons(y)))
(+)(y::Period, x::TimeType) = x + y

# Missing support
(+)(x::AbstractTime, y::Missing) = missing
(+)(x::Missing, y::AbstractTime) = missing
(-)(x::AbstractTime, y::Missing) = missing
(-)(x::Missing, y::AbstractTime) = missing

# AbstractArray{TimeType}, AbstractArray{TimeType}
(-)(x::OrdinalRange{T}, y::OrdinalRange{T}) where {T<:TimeType} = Vector(x) - Vector(y)
(-)(x::AbstractRange{T}, y::AbstractRange{T}) where {T<:TimeType} = Vector(x) - Vector(y)
Expand Down
9 changes: 9 additions & 0 deletions stdlib/Dates/test/arithmetic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,4 +499,13 @@ end
end
end

@testset "Missing arithmetic" begin
for t ∈ [Date, Time, Day, Month, Week, Year, Hour, Microsecond, Millisecond, Minute, Nanosecond, Second]
@test ismissing(t(1) + missing)
@test ismissing(missing + t(1))
@test ismissing(t(1) - missing)
@test ismissing(missing - t(1))
end
end

end