diff options
Diffstat (limited to 'stdlib/source/lux/time/duration.lux')
| -rw-r--r-- | stdlib/source/lux/time/duration.lux | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/stdlib/source/lux/time/duration.lux b/stdlib/source/lux/time/duration.lux index f38b20ccd..f0bda31ba 100644 --- a/stdlib/source/lux/time/duration.lux +++ b/stdlib/source/lux/time/duration.lux @@ -12,9 +12,9 @@ ["<t>" text (#+ Parser)]]] [data [number - ["." nat ("#@." decimal)] + ["." nat ("#\." decimal)] ["i" int]] - ["." text ("#@." monoid)]] + ["." text ("#\." monoid)]] [type abstract]]) @@ -128,9 +128,9 @@ (def: (encode duration) (if (:: ..equivalence = ..empty duration) - ($_ text@compose + ($_ text\compose ..positive-sign - (nat@encode 0) + (nat\encode 0) milli-second-suffix) (let [signed? (negative? duration) [days time-left] [(query day duration) (frame day duration)] @@ -144,13 +144,13 @@ [minutes time-left] [(query minute time-left) (frame minute time-left)] [seconds time-left] [(query second time-left) (frame second time-left)] millis (to-millis time-left)] - ($_ text@compose + ($_ text\compose (if signed? ..negative-sign ..positive-sign) - (if (i.= +0 days) "" (text@compose (nat@encode (.nat days)) ..day-suffix)) - (if (i.= +0 hours) "" (text@compose (nat@encode (.nat hours)) ..hour-suffix)) - (if (i.= +0 minutes) "" (text@compose (nat@encode (.nat minutes)) ..minute-suffix)) - (if (i.= +0 seconds) "" (text@compose (nat@encode (.nat seconds)) ..second-suffix)) - (if (i.= +0 millis) "" (text@compose (nat@encode (.nat millis)) ..milli-second-suffix)) + (if (i.= +0 days) "" (text\compose (nat\encode (.nat days)) ..day-suffix)) + (if (i.= +0 hours) "" (text\compose (nat\encode (.nat hours)) ..hour-suffix)) + (if (i.= +0 minutes) "" (text\compose (nat\encode (.nat minutes)) ..minute-suffix)) + (if (i.= +0 seconds) "" (text\compose (nat\encode (.nat seconds)) ..second-suffix)) + (if (i.= +0 millis) "" (text\compose (nat\encode (.nat millis)) ..milli-second-suffix)) )))) (def: parser |