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 99ac52ee8d238f85e350e5e4ed2a92b1fa6b32b6..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 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
 
 
 end
 
 


@@ -56,45 +64,70 @@ local function day_of_week ( day , month , year )
        return ( year + leap_years_since ( year ) + sakamoto[month] + day ) % 7 + 1
 end
 
        return ( year + leap_years_since ( year ) + sakamoto[month] + day ) % 7 + 1
 end
 

-local function increment ( tens , units , base )
+local function borrow ( tens , units , base )
+       local frac = tens % 1
+       units = units + frac * base
+       tens = tens - frac
+       return tens , units
+end
+
+local function carry ( tens , units , base )

        if units >= base then
                tens  = tens + idiv ( units , base )
                units = units % base
        elseif units < 0 then
        if units >= base then
                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
 
 -- Modify parameters so they all fit within the "normal" range
 local function normalise ( year , month , day , hour , min , sec )
        end
        return tens , units
 end
 
 -- Modify parameters so they all fit within the "normal" range
 local function normalise ( year , month , day , hour , min , sec )

-       min  , sec  = increment ( min  , sec  , 60 ) -- TODO: consider leap seconds?
-       hour , min  = increment ( hour , min  , 60 )
-       day  , hour = increment ( day  , hour , 24 )
-
-       while day <= 0 do
+       -- `month` and `day` start from 1, need -1 and +1 so it works modulo
+       month , day = month - 1 , day - 1
+
+       -- Convert everything (except seconds) to an integer
+       -- by propagating fractional components down.
+       year  , month = borrow ( year  , month , 12 )
+       -- Carry from month to year first, so we get month length correct in next line around leap years
+       year  , month = carry ( year , month , 12 )
+       month , day   = borrow ( month , day   , month_length ( floor ( month + 1 ) , year ) )
+       day   , hour  = borrow ( day   , hour  , 24 )
+       hour  , min   = borrow ( hour  , min   , 60 )
+       min   , sec   = borrow ( min   , sec   , 60 )
+
+       -- Propagate out of range values up
+       -- e.g. if `min` is 70, `hour` increments by 1 and `min` becomes 10
+       -- This has to happen for all columns after borrowing, as lower radixes may be pushed out of range
+       min   , sec   = carry ( min   , sec   , 60 ) -- TODO: consider leap seconds?
+       hour  , min   = carry ( hour  , min   , 60 )
+       day   , hour  = carry ( day   , hour  , 24 )
+       -- Ensure `day` is not underflowed
+       -- Add a whole year of days at a time, this is later resolved by adding months
+       -- TODO[OPTIMIZE]: This could be slow if `day` is far out of range
+       while day < 0 do

                year = year - 1
                day  = day + year_length ( year )
        end
                year = year - 1
                day  = day + year_length ( year )
        end

+       year , month = carry ( year , month , 12 )

 
 

-       -- Lua months start from 1, need -1 and +1 around this increment
-       month = month - 1
-       year , month = increment ( year , month , 12 )
-       month = month + 1
-
-       -- This could potentially be slow if `day` is very large
+       -- TODO[OPTIMIZE]: This could potentially be slow if `day` is very large

        while true do
        while true do

-               local i = month_length ( month , year )
-               if day <= i then break end
+               local i = month_length ( month + 1 , year )
+               if day < i then break end

                day = day - i
                month = month + 1
                day = day - i
                month = month + 1

-               if month > 12 then
-                       month = 1
+               if month >= 12 then
+                       month = 0

                        year = year + 1
                end
        end
 
                        year = year + 1
                end
        end
 

+       -- Now we can place `day` and `month` back in their normal ranges
+       -- e.g. month as 1-12 instead of 0-11
+       month , day = month + 1 , day + 1
+

        return year , month , day , hour , min , sec
 end
 
        return year , month , day , hour , min , sec
 end
 


@@ -146,8 +179,10 @@ function timetable_methods:timestamp ( )
 end
 
 function timetable_methods:rfc_3339 ( )
 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 )
 end
 
 function timetable_methods:strftime ( format_string )


@@ -202,7 +237,7 @@ local function new_from_timestamp ( ts )
        if type ( ts ) ~= "number" then
                error ( "bad argument #1 to 'new_from_timestamp' (number expected, got " .. type ( ts ) .. ")" , 2 )
        end
        if type ( ts ) ~= "number" then
                error ( "bad argument #1 to 'new_from_timestamp' (number expected, got " .. type ( ts ) .. ")" , 2 )
        end

-       return new_timetable ( 1970 , 1 , 1 , 0 , 0 , ts )
+       return new_timetable ( 1970 , 1 , 1 , 0 , 0 , ts ):normalise ( )

 end
 
 return {
 end
 
 return {