spec/: Better test descriptions.

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

diff --git a/luatz/timetable.lua b/luatz/timetable.lua
index c337f4acab5b63eecb8ab1a135399f6fa045e385..f09637255e7676bc821342dca9e91e0b4ba25e59 100644 (file)
--- a/luatz/timetable.lua
+++ b/luatz/timetable.lua
@@ -1,3 +1,4 @@
+local strftime = require "luatz.strftime".strftime
 local strformat = string.format
 local floor = math.floor
 local function idiv ( n , d )
@@ -11,6 +12,8 @@ local months_to_days_cumulative = { 0 }
 for i = 2, 12 do
        months_to_days_cumulative [ i ] = months_to_days_cumulative [ i-1 ] + mon_lengths [ i-1 ]
 end
+-- For Sakamoto's Algorithm (day of week)
+local sakamoto = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4};
 
 local function is_leap ( y )
        return (y % 4) == 0 and (y % 100) ~= 0 or (y % 400) == 0
@@ -32,19 +35,6 @@ local function leap_years_since ( year )
        return idiv ( year , 4 ) - idiv ( year , 100 ) + idiv ( year , 400 )
 end
 
-local function doomsday ( year )
-       return ( 3 -- Tuesday
-               - 1 + year + leap_years_since ( year ) )
-               % 7 + 1
-end
-local doomsday_cache = setmetatable ( { } , {
-       __index = function ( cache , year )
-               local d = doomsday ( year )
-               cache [ year ] = d
-               return d
-       end ;
-} )
-
 local function day_of_year ( day , month , year )
        local yday = months_to_days_cumulative [ month ]
        if month > 2 and is_leap ( year ) then
@@ -53,8 +43,11 @@ local function day_of_year ( day , month , year )
        return yday + day
 end
 
-local function day_of_week ( yday , year )
-       return ( yday - doomsday_cache [ year ] - 1 ) % 7 + 1
+local function day_of_week ( day , month , year )
+       if month < 3 then
+               year = year - 1
+       end
+       return ( year + leap_years_since ( year ) + sakamoto[month] + day ) % 7 + 1
 end
 
 local function increment ( tens , units , base )
@@ -135,12 +128,8 @@ function timetable_methods:normalise ( )
        self.day   = day
        self.month = month
        self.year  = year
-
-       local yday = day_of_year ( day , month , year )
-       local wday = day_of_week ( yday , year )
-
-       self.yday = yday
-       self.wday = wday
+       self.yday  = day_of_year ( day , month , year )
+       self.wday  = day_of_week ( day , month , year )
 
        return self
 end
@@ -151,8 +140,12 @@ function timetable_methods:timestamp ( )
 end
 
 function timetable_methods:rfc_3339 ( )
-       -- %06.4g gives 3 (=6-4+1) digits after decimal
-       return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.4g" , self:unpack ( ) )
+       -- %06.3f gives 3 (=6-3) digits after decimal
+       return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.3f" , self:unpack ( ) )
+end
+
+function timetable_methods:strftime ( format_string )
+       return strftime ( format_string , self )
 end
 
 local timetable_mt
@@ -168,10 +161,13 @@ timetable_mt = {
        __index    = timetable_methods ;
        __tostring = timetable_methods.rfc_3339 ;
        __eq = function ( a , b )
-               return coerce_arg ( a ) == coerce_arg ( b )
+               return a:timestamp ( ) == b:timestamp ( )
        end ;
        __lt = function ( a , b )
-               return coerce_arg ( a ) < coerce_arg ( b )
+               return a:timestamp ( ) < b:timestamp ( )
+       end ;
+       __sub = function ( a , b )
+               return coerce_arg ( a ) - coerce_arg ( b )
        end ;
 }
 
@@ -197,11 +193,15 @@ function timetable_methods:clone ( )
 end
 
 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
        return new_timetable ( 1970 , 1 , 1 , 0 , 0 , ts )
 end
 
 return {
-       doomsday  = doomsday ;
+       day_of_year = day_of_year ;
+       day_of_week = day_of_week ;
        normalise = normalise ;
        timestamp = timestamp ;