From a552494b72463f2dd0bfdf98e38f062f0dcc2d37 Mon Sep 17 00:00:00 2001 From: James Roseborough Date: Sun, 14 Jul 2013 18:53:03 +0000 Subject: [PATCH] Implement optional table argument to os.time() --- README.html | 6 ++---- src/core/org/luaj/vm2/lib/OsLib.java | 22 ++++++++++++++++++---- test/lua/luaj3.0-tests.zip | Bin 323417 -> 323550 bytes test/lua/oslib.lua | 6 +++++- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/README.html b/README.html index 6c932837..6c7f0fe2 100644 --- a/README.html +++ b/README.html @@ -459,8 +459,7 @@ A richer version for use by JsePlatform is : Time is a represented as number of seconds since the epoch, -and most time and date formatting, locales, and other features -are not implemented. +and locales are not implemented.

Coroutine Library

The coroutine library is implemented using one JavaThread per coroutine. @@ -887,7 +886,7 @@ Files are no longer hosted at LuaForge.   3.0-beta2 @@ -902,6 +901,5 @@ Files are no longer hosted at LuaForge.
  • negative zero is treated as identical to integer value zero throughout luaj
  • lua compiled into java bytecode using luajc cannot use string.dump() or xpcall()
  • number formatting with string.format() is not supported -
  • os.time(), and os.date() not completely supported diff --git a/src/core/org/luaj/vm2/lib/OsLib.java b/src/core/org/luaj/vm2/lib/OsLib.java index 14b7a562..632eff4c 100644 --- a/src/core/org/luaj/vm2/lib/OsLib.java +++ b/src/core/org/luaj/vm2/lib/OsLib.java @@ -178,9 +178,8 @@ public class OsLib extends TwoArgFunction { String s = setlocale(args.optjstring(1,null), args.optjstring(2, "all")); return s!=null? valueOf(s): NIL; } - case TIME: { - return valueOf(time(args.arg1().isnil()? null: args.checktable(1))); - } + case TIME: + return valueOf(time(args.opttable(1, null))); case TMPNAME: return valueOf(tmpname()); } @@ -348,6 +347,7 @@ public class OsLib extends TwoArgFunction { y0.set(Calendar.HOUR_OF_DAY, 0); y0.set(Calendar.MINUTE, 0); y0.set(Calendar.SECOND, 0); + y0.set(Calendar.MILLISECOND, 0); return y0; } @@ -466,7 +466,21 @@ public class OsLib extends TwoArgFunction { * @return long value for the time */ protected double time(LuaTable table) { - return (new java.util.Date()).getTime() / 1000.; + java.util.Date d; + if (table == null) { + d = new java.util.Date(); + } else { + Calendar c = Calendar.getInstance(); + c.set(Calendar.YEAR, table.get("year").checkint()); + c.set(Calendar.MONTH, table.get("month").checkint()-1); + c.set(Calendar.DAY_OF_MONTH, table.get("day").checkint()); + c.set(Calendar.HOUR, table.get("hour").optint(12)); + c.set(Calendar.MINUTE, table.get("min").optint(0)); + c.set(Calendar.SECOND, table.get("sec").optint(0)); + c.set(Calendar.MILLISECOND, 0); + d = c.getTime(); + } + return d.getTime() / 1000.; } /** diff --git a/test/lua/luaj3.0-tests.zip b/test/lua/luaj3.0-tests.zip index 3760762d1502ed0df033a8fe032f093ef6586212..40b70f0281b64829cacc25e795a12f6a9d97975c 100644 GIT binary patch delta 8754 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 delta 8712 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 C8PZ4q diff --git a/test/lua/oslib.lua b/test/lua/oslib.lua index 2a4cf3c1..dd40a791 100644 --- a/test/lua/oslib.lua +++ b/test/lua/oslib.lua @@ -53,4 +53,8 @@ local tbl = os.date('*t', t) for i,k in ipairs({'year', 'month', 'day', 'hour', 'min', 'sec', 'wday', 'yday', 'isdst'}) do local v = tbl[k] print('k', type(k), k, 'v', type(v), v) -end \ No newline at end of file +end + +print('type(os.time())', type(os.time())) +print('os.time({year=1971, month=2, day=25})', os.time({year=1971, month=2, day=25})) +print('os.time({year=1971, month=2, day=25, hour=11, min=22, sec=33})', os.time({year=1971, month=2, day=25, hour=11, min=22, sec=33}))