Skip to content

Commit

Permalink
Updated use of Timedesc
Browse files Browse the repository at this point in the history
  • Loading branch information
@darrenldl
darrenldl committed Nov 28, 2023
1 parent 402f08f commit 6f77e41
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions debug/main.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ let debug_resolver () =
~tz ()
in
let search_start =
Timedesc.to_timestamp search_start_dt |> Timedesc.min_of_local_dt_result
Timedesc.to_timestamp search_start_dt |> Timedesc.min_of_local_date_time_result
in
let search_end_exc_dt =
Timedesc.make_exn ~year:0000 ~month:1 ~day:1 ~hour:14 ~minute:0 ~second:1
~tz ()
in
let search_end_exc =
Timedesc.to_timestamp search_end_exc_dt |> Timedesc.max_of_local_dt_result
Timedesc.to_timestamp search_end_exc_dt |> Timedesc.max_of_local_date_time_result
in
let timere' =
Time.(
Expand Down
4 changes: 2 additions & 2 deletions fuzz/resolver_is_same_as_simple_resolver.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ let search_start_dt =
~tz:Timedesc.Time_zone.utc ()

let search_start =
Timedesc.to_timestamp search_start_dt |> Timedesc.min_of_local_dt_result
Timedesc.to_timestamp search_start_dt |> Timedesc.min_of_local_date_time_result

let search_end_exc_dt =
Timedesc.make_exn ~year:2003 ~month:1 ~day:1 ~hour:0 ~minute:0 ~second:0
~tz:Timedesc.Time_zone.utc ()

let search_end_exc =
Timedesc.to_timestamp search_end_exc_dt |> Timedesc.max_of_local_dt_result
Timedesc.to_timestamp search_end_exc_dt |> Timedesc.max_of_local_date_time_result

let () =
Crowbar.add_test ~name:"resolver_is_same_as_simple_resolver" [ time ]
Expand Down
4 changes: 2 additions & 2 deletions fuzz/simple_resolver.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ let do_chunk_at_year_boundary tz (s : Time.Interval'.t Seq.t) :
~ns:(Timedesc.Span.ns_count_in_s - 1)
()
|> Timedesc.to_timestamp
|> Timedesc.max_of_local_dt_result
|> Timedesc.max_of_local_date_time_result
|> Timedesc.Span.succ
in
fun () ->
Expand Down Expand Up @@ -100,7 +100,7 @@ let do_chunk_at_month_boundary tz (s : Time.Interval'.t Seq.t) :
~ns:(Timedesc.Span.ns_count_in_s - 1)
()
|> Timedesc.to_timestamp
|> Timedesc.max_of_local_dt_result
|> Timedesc.max_of_local_date_time_result
|> Timedesc.Span.succ
in
fun () ->
Expand Down
2 changes: 1 addition & 1 deletion timere-tests/builder.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ let make_timestamp_intervals ~rng ~min_year ~max_year_inc =
let start =
make_date_time ~rng ~min_year ~max_year_inc
|> Timedesc.to_timestamp
|> Timedesc.min_of_local_dt_result
|> Timedesc.min_of_local_date_time_result
in
let end_exc =
Timedesc.Span.add start (Timedesc.Span.make ~ns:(rng ()) ())
Expand Down
18 changes: 9 additions & 9 deletions timere/resolver.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ let result_space_of_year_range tz year_range =
Timedesc.make_exn ~tz ~year:start ~month:1 ~day:1 ~hour:0 ~minute:0
~second:0 ()
|> Timedesc.to_timestamp
|> Timedesc.min_of_local_dt_result
|> Timedesc.min_of_local_date_time_result
in
let aux_end_inc end_exc =
if end_exc = Timedesc.(year max_val) then Timedesc.Timestamp.max_val
Expand All @@ -141,14 +141,14 @@ let result_space_of_year_range tz year_range =
~ns:(Timedesc.Span.ns_count_in_s - 1)
()
|> Timedesc.to_timestamp
|> Timedesc.max_of_local_dt_result
|> Timedesc.max_of_local_date_time_result
|> Timedesc.Span.succ
in
let aux_end_exc end_exc =
Timedesc.make_exn ~tz ~year:end_exc ~month:1 ~day:1 ~hour:0 ~minute:0
~second:0 ()
|> Timedesc.to_timestamp
|> Timedesc.min_of_local_dt_result
|> Timedesc.min_of_local_date_time_result
in
match year_range with
| `Range_inc (start, end_inc) -> (aux_start start, aux_end_inc end_inc)
Expand Down Expand Up @@ -207,12 +207,12 @@ let overapproximate_result_space_bottom_up default_tz (t : t) : t =
| None -> default_result_space
| Some dt ->
let space_start =
dt |> Timedesc.to_timestamp |> Timedesc.min_of_local_dt_result
dt |> Timedesc.to_timestamp |> Timedesc.min_of_local_date_time_result
in
let space_end_exc =
dt
|> Timedesc.to_timestamp
|> Timedesc.max_of_local_dt_result
|> Timedesc.max_of_local_date_time_result
|> Timedesc.Span.add bound
in
[ (space_start, space_end_exc) ]
Expand Down Expand Up @@ -328,7 +328,7 @@ let do_chunk_at_year_boundary tz (s : Time.Interval'.t Seq.t) =
~ns:(Timedesc.Span.ns_count_in_s - 1)
()
|> Timedesc.to_timestamp
|> Timedesc.max_of_local_dt_result
|> Timedesc.max_of_local_date_time_result
|> Timedesc.Span.succ
in
fun () ->
Expand Down Expand Up @@ -363,7 +363,7 @@ let do_chunk_at_month_boundary tz (s : Time.Interval'.t Seq.t) =
~ns:(Timedesc.Span.ns_count_in_s - 1)
()
|> Timedesc.to_timestamp
|> Timedesc.max_of_local_dt_result
|> Timedesc.max_of_local_date_time_result
|> Timedesc.Span.succ
in
fun () ->
Expand Down Expand Up @@ -439,7 +439,7 @@ let aux_iso_week_pattern search_using_tz space years weeks =
~hour:0 ~minute:0 ~second:0
()
|> Timedesc.to_timestamp
|> Timedesc.min_of_local_dt_result
|> Timedesc.min_of_local_date_time_result
in
let year, week =
Timedesc.ISO_week.make_exn ~year ~week
Expand All @@ -452,7 +452,7 @@ let aux_iso_week_pattern search_using_tz space years weeks =
~hour:0 ~minute:0 ~second:0
()
|> Timedesc.to_timestamp
|> Timedesc.max_of_local_dt_result
|> Timedesc.max_of_local_date_time_result
in
(x, y)
) weeks
Expand Down
6 changes: 3 additions & 3 deletions timere/time.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1423,11 +1423,11 @@ let after_timestamp timestamp =
intervals [ (Timedesc.Span.succ timestamp, Timedesc.Timestamp.max_val) ]

let before dt =
before_timestamp Timedesc.(to_timestamp dt |> min_of_local_dt_result)
before_timestamp Timedesc.(to_timestamp dt |> min_of_local_date_time_result)

let since dt = since_timestamp Timedesc.(to_timestamp dt |> max_of_local_dt_result)
let since dt = since_timestamp Timedesc.(to_timestamp dt |> max_of_local_date_time_result)

let after dt = after_timestamp Timedesc.(to_timestamp dt |> max_of_local_dt_result)
let after dt = after_timestamp Timedesc.(to_timestamp dt |> max_of_local_date_time_result)

let nth_weekday_of_month (n : int) wday =
let first_weekday_of_month wday =
Expand Down

0 comments on commit 6f77e41

Please sign in to comment.