luatz/timetable: Move require call to top of file

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

diff --git a/luatz/timetable.lua b/luatz/timetable.lua
index e1649a0239517c4c15bb31ca3b3191216110be1e..6a39a132fc8d59a1c53c7e6d39ed6740ba9d6146 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 )
 local strformat = string.format
 local floor = math.floor
 local function idiv ( n , d )


@@ -143,23 +144,18 @@ function timetable_methods:rfc_3339 ( )
        return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.3f" , self:unpack ( ) )
 end
 
        return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.3f" , self:unpack ( ) )
 end
 

-local timetable_mt
-
-local function coerce_arg ( t )
-       if getmetatable ( t ) == timetable_mt then
-               return t:timestamp ( )
-       end
-       return t
+function timetable_methods:strftime ( format_string )
+       return strftime ( format_string , self )

 end
 
 end
 

-timetable_mt = {
+local 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 coerce_arg ( a ) == coerce_arg ( b )
+               return a:timestamp ( ) == b:timestamp ( )

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

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

        end ;
 }
 
        end ;
 }