.travis.yml: Test on multiple lua versions

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

diff --git a/src/timetable.lua b/src/timetable.lua
index 7e986a15c62b87802dcf65d98fccc4101fb52af1..c71c59bc25d737ebc27c60b0586b719dd1d25c8f 100644 (file)
--- a/src/timetable.lua
+++ b/src/timetable.lua
@@ -98,6 +98,17 @@ local function normalise ( year , month , day , hour , min , sec )
        return year , month , day , hour , min , sec
 end
 
        return year , month , day , hour , min , sec
 end
 

+local function timestamp ( year , month , day , hour , min , sec )
+       return 60*60*24*(
+                       year * year_length ( year )
+                       + month * month_length ( month , year )
+                       + day
+               )
+               + hour  * (60*60)
+               + min   * 60
+               + sec
+end
+

 
 local timetable_methods = { }
 
 
 local timetable_methods = { }
 


@@ -119,8 +130,21 @@ function timetable_methods:normalise ( )
 end
 timetable_methods.normalize = timetable_methods.normalise -- American English
 
 end
 timetable_methods.normalize = timetable_methods.normalise -- American English
 

+function timetable_methods:timestamp ( )
+       return timestamp ( unpack_tm ( self ) )
+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" , unpack_tm ( self ) )
+end
+

 local timetable_mt = {
        __index    = timetable_methods ;
 local timetable_mt = {
        __index    = timetable_methods ;

+       __tostring = timetable_methods.rfc_3339 ;
+       __eq = function ( a , b )
+               return a:timestamp() < b:timestamp()
+       end ;

 }
 
 local function cast_timetable ( tm )
 }
 
 local function cast_timetable ( tm )


@@ -141,6 +165,7 @@ end
 return {
        doomsday  = doomsday ;
        normalise = normalise ;
 return {
        doomsday  = doomsday ;
        normalise = normalise ;

+       timestamp = timestamp ;

 
        new = new_timetable ;
        cast = cast_timetable ;
 
        new = new_timetable ;
        cast = cast_timetable ;