luatz/timetable: Add __sub metamethod to allow subtraction of timetables. Reintroduce...

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

diff --git a/luatz/timetable.lua b/luatz/timetable.lua
index 6cded3163932f0e4d66fc68b102e41143df22053..10af17018f90a9f14f5ef0c2ce72af9f9e367616 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,16 +144,20 @@ 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 strftime = require "luatz.strftime".strftime

 function timetable_methods:strftime ( format_string )
        return strftime ( format_string , self )
 end
 
 function timetable_methods:strftime ( format_string )
        return strftime ( format_string , self )
 end
 

-function timetable_methods:asctime ( )
-       return self:strftime ( "%c\n" )
+local timetable_mt
+
+local function coerce_arg ( t )
+       if getmetatable ( t ) == timetable_mt then
+               return t:timestamp ( )
+       end
+       return t

 end
 
 end
 

-local timetable_mt = {
+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 )


@@ -161,6 +166,9 @@ local timetable_mt = {
        __lt = function ( a , b )
                return a:timestamp ( ) < b:timestamp ( )
        end ;
        __lt = function ( a , b )
                return a:timestamp ( ) < b:timestamp ( )
        end ;

+       __sub = function ( a , b )
+               return coerce_arg ( a ) - coerce_arg ( b )
+       end ;

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