open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

ix os.date("*t") to return hour in 24 hour format (fixes issue #45)

Browse Source
This commit is contained in:
James Roseborough
2015-03-18 16:16:13 +00:00
parent 87f19030cb
commit 85381770a7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.html
View File

@@ -977,8 +977,9 @@ Files are no longer hosted at LuaForge.
<li>Fix return value for table.remove() and table.insert() (fixes issue #39)</li> <li>Fix return value for table.remove() and table.insert() (fixes issue #39)</li>
<li>Fix aliasing issue for some multiple assignments from varargs return values (fixes issue #38)</li> <li>Fix aliasing issue for some multiple assignments from varargs return values (fixes issue #38)</li>
<li>Let os.getenv() return System.getenv() values first for JSE, then fall back to properties (fixes issue #25)</li> <li>Let os.getenv() return System.getenv() values first for JSE, then fall back to properties (fixes issue #25)</li>
<li>Improve collection of orphaned coroutines when yielding from debug hook functions.</li> <li>Improve garbage collection of orphaned coroutines when yielding from debug hook functions (fixes issue #32).</li>
<li>LuaScriptEngineFactory.getScriptEngine() now returns new instance of lua script engine for each call.</li> <li>LuaScriptEngineFactory.getScriptEngine() now returns new instance of LuaScriptEngine for each call.</li>
<li>Fix os.date("*t") to return hour in 24 hour format (fixes issue #45)</li>
</ul></td></tr> </ul></td></tr>
</table></td></tr></table> </table></td></tr></table>

2
src/core/org/luaj/vm2/lib/OsLib.java
View File

@@ -150,7 +150,7 @@ public class OsLib extends TwoArgFunction {
tbl.set("year", LuaValue.valueOf(d.get(Calendar.YEAR))); tbl.set("year", LuaValue.valueOf(d.get(Calendar.YEAR)));
tbl.set("month", LuaValue.valueOf(d.get(Calendar.MONTH)+1)); tbl.set("month", LuaValue.valueOf(d.get(Calendar.MONTH)+1));
tbl.set("day", LuaValue.valueOf(d.get(Calendar.DAY_OF_MONTH))); tbl.set("day", LuaValue.valueOf(d.get(Calendar.DAY_OF_MONTH)));
tbl.set("hour", LuaValue.valueOf(d.get(Calendar.HOUR))); tbl.set("hour", LuaValue.valueOf(d.get(Calendar.HOUR_OF_DAY)));
tbl.set("min", LuaValue.valueOf(d.get(Calendar.MINUTE))); tbl.set("min", LuaValue.valueOf(d.get(Calendar.MINUTE)));
tbl.set("sec", LuaValue.valueOf(d.get(Calendar.SECOND))); tbl.set("sec", LuaValue.valueOf(d.get(Calendar.SECOND)));
tbl.set("wday", LuaValue.valueOf(d.get(Calendar.DAY_OF_WEEK))); tbl.set("wday", LuaValue.valueOf(d.get(Calendar.DAY_OF_WEEK)));