NEWS: Add NEWS file

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

diff --git a/luatz/timetable.lua b/luatz/timetable.lua
index fc89fcaec5c7271d6756ed4c3ff0429e01ff7280..0dbf4c8eedb5d6fdce95d0f80187ef08e1363de0 100644 (file)
--- a/luatz/timetable.lua
+++ b/luatz/timetable.lua
@@ -1,8 +1,16 @@
 local strftime = require "luatz.strftime".strftime
 local strformat = string.format
 local floor = math.floor
-local function idiv ( n , d )
-       return floor ( n / d )
+local idiv do
+       -- Try and use actual integer division when available (Lua 5.3+)
+       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
+               idiv = function(n, d)
+                       return floor(n/d)
+               end
+       end
 end
 
 
@@ -68,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
@@ -171,8 +179,10 @@ function timetable_methods:timestamp ( )
 end
 
 function timetable_methods:rfc_3339 ( )
-       -- %06.3f gives 3 (=6-3) digits after decimal
-       return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.3f" , self:unpack ( ) )
+       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
 
 function timetable_methods:strftime ( format_string )