src/init: Export timetable from main module

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

diff --git a/src/timetable.lua b/src/timetable.lua
index a5d0cc776f771629088f78e58a4519ede095a598..d1cd534a624f8c8653929b72dd556e1966601027 100644 (file)
--- a/src/timetable.lua
+++ b/src/timetable.lua
@@ -151,14 +151,23 @@ function timetable_methods:rfc_3339 ( )
        return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.4g" , unpack_tm ( self ) )
 end
 
        return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.4g" , unpack_tm ( self ) )
 end
 

-local timetable_mt = {
+local timetable_mt
+
+local function coerce_arg ( t )
+       if getmetatable ( t ) == timetable_mt then
+               return t:timestamp ( )
+       end
+       return t
+end
+
+timetable_mt = {

        __index    = timetable_methods ;
        __tostring = timetable_methods.rfc_3339 ;
        __eq = function ( a , b )
        __index    = timetable_methods ;
        __tostring = timetable_methods.rfc_3339 ;
        __eq = function ( a , b )

-               return a:timestamp() == b:timestamp()
+               return coerce_arg ( a ) == coerce_arg ( b )

        end ;
        __lt = function ( a , b )
        end ;
        __lt = function ( a , b )

-               return a:timestamp() < b:timestamp()
+               return coerce_arg ( a ) < coerce_arg ( b )

        end ;
 }
 
        end ;
 }
 


@@ -179,6 +188,10 @@ local function new_timetable ( year , month , day , hour , min , sec , yday , wd
        }
 end
 
        }
 end
 

+function timetable_methods:clone ( )
+       return new_timetable ( unpack_tm ( self ) )
+end
+

 local function new_from_timestamp ( ts )
        return new_timetable ( 1970 , 1 , 1 , 0 , 0 , ts )
 end
 local function new_from_timestamp ( ts )
        return new_timetable ( 1970 , 1 , 1 , 0 , 0 , ts )
 end