Mercurial Hosting > luan

comparison src/luan/modules/Time.luan @ 1097:b2e4a22ffa5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix Time bugs
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 28 Mar 2017 20:58:28 -0600
parents bae2d0c2576c
children bae624e455e2
comparison
equal deleted inserted replaced
1096:5dc601c4ed6d 1097:b2e4a22ffa5d
33 local rtn = {} 33 local rtn = {}
34 for i, v in ipairs{...} do 34 for i, v in ipairs{...} do
35 local fld = fields[v] 35 local fld = fields[v]
36 fld or error("invalid field: "..v) 36 fld or error("invalid field: "..v)
37 local n = cal.get(fld) 37 local n = cal.get(fld)
38 if fld == "month" then 38 if v == "month" then
39 n = n + 1 39 n = n + 1
40 end 40 end
41 rtn[i] = n 41 rtn[i] = n
42 end 42 end
43 return Table.unpack(rtn) 43 return Table.unpack(rtn)
50 end 50 end
51 51
52 function Time.on( year, month, day, hour, minute, second, millis ) 52 function Time.on( year, month, day, hour, minute, second, millis )
53 month = month - 1 53 month = month - 1
54 local cal = Calendar.getInstance() 54 local cal = Calendar.getInstance()
55 cal.setLenient(false) 55 -- cal.setLenient(false)
56 cal.set( year, month, day, hour or 0, minute or 0, second or 0 ) 56 cal.set( year, month, day, hour or 0, minute or 0, second or 0 )
57 cal.set( Calendar.MILLISECOND, millis or 0 ) 57 cal.set( Calendar.MILLISECOND, millis or 0 )
58 return cal.getTimeInMillis() 58 return cal.getTimeInMillis()
59 end 59 end
60 60