diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/library/lux/time.lux | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/time.lux index 42b850964..c1ab45cd2 100644 --- a/stdlib/source/library/lux/time.lux +++ b/stdlib/source/library/lux/time.lux @@ -36,7 +36,7 @@ (def: limit Nat - (.nat (duration.to_millis duration.day))) + (.nat (duration.millis duration.day))) (exception: #export (time_exceeds_a_day {time Nat}) (exception.report @@ -92,7 +92,7 @@ (#try.Success (:abstraction milli_seconds)) (exception.except ..time_exceeds_a_day [milli_seconds]))) - (def: #export to_millis + (def: #export millis (-> Time Nat) (|>> :representation)) @@ -127,12 +127,12 @@ (def: #export parser (Parser Time) - (let [to_millis (: (-> Duration Nat) - (|>> duration.to_millis .nat)) - hour (to_millis duration.hour) - minute (to_millis duration.minute) - second (to_millis duration.second) - millis (to_millis duration.milli_second)] + (let [millis (: (-> Duration Nat) + (|>> duration.millis .nat)) + hour (millis duration.hour) + minute (millis duration.minute) + second (millis duration.second) + millis (millis duration.milli_second)] (do {! <>.monad} [utc_hour ..hour_parser _ (<text>.this ..separator) @@ -154,7 +154,7 @@ (text\compose "0" (n\encode value)) (n\encode value))) -(def: (adjust_negative space duration) +(def: (positive space duration) (-> Duration Duration Duration) (if (duration.negative? duration) (duration.merged space duration) @@ -176,7 +176,7 @@ (def: #export (clock time) (-> Time Clock) - (let [time (|> time ..to_millis .int duration.of_millis) + (let [time (|> time ..millis .int duration.of_millis) [hours time] [(duration.query duration.hour time) (duration.framed duration.hour time)] [minutes time] [(duration.query duration.minute time) (duration.framed duration.minute time)] [seconds millis] [(duration.query duration.second time) (duration.framed duration.second time)]] @@ -184,8 +184,8 @@ #minute (.nat minutes) #second (.nat seconds) #milli_second (|> millis - (..adjust_negative duration.second) - duration.to_millis + (..positive duration.second) + duration.millis .nat)})) (def: #export (time clock) @@ -195,7 +195,7 @@ (duration.up (get@ #minute clock) duration.minute) (duration.up (get@ #second clock) duration.second) (duration.of_millis (.int (get@ #milli_second clock)))) - duration.to_millis + duration.millis .nat ..of_millis)) |