luatz/timetable: Fix incorrect math for negative carry operations

[etc/awesome.git] / luatz / timetable.lua

diff --git a/luatz/timetable.lua b/luatz/timetable.lua
index 783d60b0170c7226d6aa0bb77d162fcdb6e8ce1b..0dbf4c8eedb5d6fdce95d0f80187ef08e1363de0 100644 (file)
--- a/luatz/timetable.lua
+++ b/luatz/timetable.lua
@@ -3,7 +3,7 @@ local strformat = string.format
 local floor = math.floor
 local idiv do
        -- Try and use actual integer division when available (Lua 5.3+)
-       local idiv_loader, err = (loadstring or load)([[return function(n,d) return n//d end]], "idiv")
+       local idiv_loader = (loadstring or load)([[return function(n,d) return n//d end]], "idiv") -- luacheck: ignore 113
        if idiv_loader then
                idiv = idiv_loader()
        else
@@ -76,8 +76,8 @@ local function carry ( tens , units , base )
                tens  = tens + idiv ( units , base )
                units = units % base
        elseif units < 0 then
-               tens  = tens - 1 + idiv ( -units , base )
-               units = base - ( -units % base )
+               tens  = tens + idiv ( units , base )
+               units = ( base + units ) % base
        end
        return tens , units
 end
@@ -179,8 +179,9 @@ function timetable_methods:timestamp ( )
 end
 
 function timetable_methods:rfc_3339 ( )
-       local year , month , day , hour , min , sec = self:unpack ( )
-       local sec , msec = borrow ( sec , 0 , 1000 )
+       local year, month, day, hour, min, fsec = self:unpack()
+       local sec, msec = borrow(fsec, 0, 1000)
+       msec = math.floor(msec)
        return strformat ( "%04u-%02u-%02uT%02u:%02u:%02d.%03d" , year , month , day , hour , min , sec , msec )
 end