X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6c4658848c01ae0862a2fcad7f6565efd9aa948d..d5edaa6f361af75bebab47497b4654cbe428a1b7:/luatz/timetable.lua?ds=inline

diff --git a/luatz/timetable.lua b/luatz/timetable.lua
index 3e80242..5c234b6 100644
--- a/luatz/timetable.lua
+++ b/luatz/timetable.lua
@@ -1,8 +1,16 @@
 local strftime = require "luatz.strftime".strftime
 local strformat = string.format
 local floor = math.floor
-local function idiv ( n , d )
-	return floor ( n / d )
+local idiv do
+	-- Try and use actual integer division when available (Lua 5.3+)
+	local idiv_loader, err = (loadstring or load)([[return function(n,d) return n//d end]], "idiv")
+	if idiv_loader then
+		idiv = idiv_loader()
+	else
+		idiv = function(n, d)
+			return floor(n/d)
+		end
+	end
 end
 
 
@@ -171,8 +179,10 @@ function timetable_methods:timestamp ( )
 end
 
 function timetable_methods:rfc_3339 ( )
-	-- %06.3f gives 3 (=6-3) digits after decimal
-	return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.3f" , self:unpack ( ) )
+	local year , month , day , hour , min , sec = self:unpack ( )
+	local sec , msec = borrow ( sec , 0 , 1000 )
+	msec = math.floor(msec)
+	return strformat ( "%04u-%02u-%02uT%02u:%02u:%02d.%03d" , year , month , day , hour , min , sec , msec )
 end
 
 function timetable_methods:strftime ( format_string )
@@ -227,7 +237,7 @@ 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 )
+	return new_timetable ( 1970 , 1 , 1 , 0 , 0 , ts ):normalise ( )
 end
 
 return {