mirrors/lua-date
1
0
Fork 0
mirror of https://github.com/TangentFoxy/lua-date.git synced 2025-07-28 11:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

whitespace fixes

Browse Source
This commit is contained in:
Thijs Schreijer
2013-09-14 21:52:21 +02:00
parent b72fdf18c8
commit 0a94ddd704
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
date.lua
View File

@@ -196,7 +196,7 @@
local function makedaynum_isoywd(y,w,d) local function makedaynum_isoywd(y,w,d)
return isow1(y) + 7*w + d - 8 -- simplified: isow1(y) + ((w-1)*7) + (d-1) return isow1(y) + 7*w + d - 8 -- simplified: isow1(y) + ((w-1)*7) + (d-1)
end end
--[[ THE DATE MOUDLE ]]-- --[[ THE DATE MODULE ]]--
local fmtstr = "%x %X"; local fmtstr = "%x %X";
--#if not DATE_OBJECT_AFX then --#if not DATE_OBJECT_AFX then
local date = {} local date = {}
@@ -402,8 +402,8 @@
return (o and o:normalize() or error"invalid date time value"), r -- if r is true then o is a reference to a date obj return (o and o:normalize() or error"invalid date time value"), r -- if r is true then o is a reference to a date obj
end end
--#end -- not DATE_OBJECT_AFX --#end -- not DATE_OBJECT_AFX
local function date_from(...) local function date_from(...)
local y, m, d = fix(arg[1]), getmontharg(arg[2]), fix(arg[3]) local y, m, d = fix(arg[1]), getmontharg(arg[2]), fix(arg[3])
local h, r, s, t = tonumber(arg[4] or 0), tonumber(arg[5] or 0), tonumber(arg[6] or 0), tonumber(arg[7] or 0) local h, r, s, t = tonumber(arg[4] or 0), tonumber(arg[5] or 0), tonumber(arg[6] or 0), tonumber(arg[7] or 0)
if y and m and d and h and r and s and t then if y and m and d and h and r and s and t then
return date_new(makedaynum(y, m, d), makedayfrc(h, r, s, t)):normalize() return date_new(makedaynum(y, m, d), makedayfrc(h, r, s, t)):normalize()
@@ -450,13 +450,13 @@
end end
function dobj:getisoweekday() return mod(weekday(self.daynum)-1,7)+1 end -- sunday = 7, monday = 1 ... function dobj:getisoweekday() return mod(weekday(self.daynum)-1,7)+1 end -- sunday = 7, monday = 1 ...
function dobj:getisoweeknumber() return (isowy(self.daynum)) end function dobj:getisoweeknumber() return (isowy(self.daynum)) end
function dobj:getisoyear() return isoy(self.daynum) end function dobj:getisoyear() return isoy(self.daynum) end
function dobj:getisodate() function dobj:getisodate()
local w, y = isowy(self.daynum) local w, y = isowy(self.daynum)
return y, w, self:getisoweekday() return y, w, self:getisoweekday()
end end
function dobj:setisoyear(y, w, d) function dobj:setisoyear(y, w, d)
local cy, cw, cd = self:getisodate() local cy, cw, cd = self:getisodate()
if y then cy = fix(tonumber(y))end if y then cy = fix(tonumber(y))end
if w then cw = fix(tonumber(w))end if w then cw = fix(tonumber(w))end
@@ -470,7 +470,7 @@
end end
function dobj:setisoweekday(d) return self:setisoyear(nil, nil, d) end function dobj:setisoweekday(d) return self:setisoyear(nil, nil, d) end
function dobj:setisoweeknumber(w,d) return self:setisoyear(nil, w, d) end function dobj:setisoweeknumber(w,d) return self:setisoyear(nil, w, d) end
function dobj:setyear(y, m, d) function dobj:setyear(y, m, d)
local cy, cm, cd = breakdaynum(self.daynum) local cy, cm, cd = breakdaynum(self.daynum)
@@ -537,11 +537,11 @@
return date_error_arg() return date_error_arg()
end end
end end
function dobj:adddays(n) return dobj_adddayfrc(self,n,TICKSPERDAY,1) end function dobj:adddays(n) return dobj_adddayfrc(self,n,TICKSPERDAY,1) end
function dobj:addhours(n) return dobj_adddayfrc(self,n,TICKSPERHOUR,HOURPERDAY) end function dobj:addhours(n) return dobj_adddayfrc(self,n,TICKSPERHOUR,HOURPERDAY) end
function dobj:addminutes(n) return dobj_adddayfrc(self,n,TICKSPERMIN,MINPERDAY) end function dobj:addminutes(n) return dobj_adddayfrc(self,n,TICKSPERMIN,MINPERDAY) end
function dobj:addseconds(n) return dobj_adddayfrc(self,n,TICKSPERSEC,SECPERDAY) end function dobj:addseconds(n) return dobj_adddayfrc(self,n,TICKSPERSEC,SECPERDAY) end
function dobj:addticks(n) return dobj_adddayfrc(self,n,1,TICKSPERDAY) end function dobj:addticks(n) return dobj_adddayfrc(self,n,1,TICKSPERDAY) end
local tvspec = { local tvspec = {
-- Abbreviated weekday name (Sun) -- Abbreviated weekday name (Sun)
['%a']=function(self) return sl_weekdays[weekday(self.daynum) + 7] end, ['%a']=function(self) return sl_weekdays[weekday(self.daynum) + 7] end,
@@ -655,9 +655,9 @@
function dobj:copy() return date_new(self.daynum, self.dayfrc) end function dobj:copy() return date_new(self.daynum, self.dayfrc) end
--[[ THE LOCAL DATE OBJECT METHODS ]]-- --[[ THE LOCAL DATE OBJECT METHODS ]]--
function dobj:tolocal() function dobj:tolocal()
local dn,df = self.daynum, self.dayfrc local dn,df = self.daynum, self.dayfrc
local bias = getbiasutc2(self) local bias = getbiasutc2(self)
if bias then if bias then
-- utc = local + bias; local = utc - bias -- utc = local + bias; local = utc - bias
@@ -670,7 +670,7 @@
end end
function dobj:toutc() function dobj:toutc()
local dn,df = self.daynum, self.dayfrc local dn,df = self.daynum, self.dayfrc
local bias = getbiasloc2(dn, df) local bias = getbiasloc2(dn, df)
if bias then if bias then
-- utc = local + bias; -- utc = local + bias;
@@ -690,14 +690,14 @@
end end
--#if not DATE_OBJECT_AFX then --#if not DATE_OBJECT_AFX then
function date.time(h, r, s, t) function date.time(h, r, s, t)
h, r, s, t = tonumber(h or 0), tonumber(r or 0), tonumber(s or 0), tonumber(t or 0) h, r, s, t = tonumber(h or 0), tonumber(r or 0), tonumber(s or 0), tonumber(t or 0)
if h and r and s and t then if h and r and s and t then
return date_new(DAYNUM_DEF, makedayfrc(h, r, s, t)) return date_new(DAYNUM_DEF, makedayfrc(h, r, s, t))
else else
return date_error_arg() return date_error_arg()
end end
end end
function date:__call(...) function date:__call(...)
local n = arg.n local n = arg.n
@@ -724,7 +724,7 @@
-- Internal functions -- Internal functions
function date.fmt(str) if str then fmtstr = str end; return fmtstr end function date.fmt(str) if str then fmtstr = str end; return fmtstr end
function date.daynummin(n) DAYNUM_MIN = (n and n < DAYNUM_MAX) and n or DAYNUM_MIN return n and DAYNUM_MIN or date_new(DAYNUM_MIN, 0):normalize()end function date.daynummin(n) DAYNUM_MIN = (n and n < DAYNUM_MAX) and n or DAYNUM_MIN return n and DAYNUM_MIN or date_new(DAYNUM_MIN, 0):normalize()end
function date.daynummax(n) DAYNUM_MAX = (n and n > DAYNUM_MIN) and n or DAYNUM_MAX return n and DAYNUM_MAX or date_new(DAYNUM_MAX, 0):normalize()end function date.daynummax(n) DAYNUM_MAX = (n and n > DAYNUM_MIN) and n or DAYNUM_MAX return n and DAYNUM_MAX or date_new(DAYNUM_MAX, 0):normalize()end
function date.ticks(t) if t then setticks(t) end return TICKSPERSEC end function date.ticks(t) if t then setticks(t) end return TICKSPERSEC end
--#end -- not DATE_OBJECT_AFX --#end -- not DATE_OBJECT_AFX