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

Fix os.time() to return a number of seconds.

Browse Source
This commit is contained in:
James Roseborough
2013-07-13 15:56:59 +00:00
parent efe0dc42bd
commit 07fb564edd
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.html
View File

@@ -886,6 +886,7 @@ Files are no longer hosted at LuaForge.
<tr valign="top"><td>&nbsp;&nbsp;<b>3.0-beta2</b></td><td><ul> <tr valign="top"><td>&nbsp;&nbsp;<b>3.0-beta2</b></td><td><ul>
<li>LuaValue.checkfunction() now returns LuaFunction.</li> <li>LuaValue.checkfunction() now returns LuaFunction.</li>
<li>Fix os.time() to return a number of seconds.</li>
</ul></td></tr> </ul></td></tr>
</table></td></tr></table> </table></td></tr></table>
@@ -894,10 +895,12 @@ Files are no longer hosted at LuaForge.
<ul> <ul>
<li>debug code may not be completely removed by some obfuscators <li>debug code may not be completely removed by some obfuscators
<li>tail calls are not tracked in debug information <li>tail calls are not tracked in debug information
<li>using both version 1 and 2 libraries together in the same java vm has not been tested <li>mixing major versions in the same java vm has not been tested
<li>values associated with weak keys may linger longer than expected <li>values associated with weak keys may linger longer than expected
<li>behavior of luaj when a SecurityManager is used has not been fully characterized <li>behavior of luaj when a SecurityManager is used has not been fully characterized
<li>negative zero is treated as identical to integer value zero throughout luaj <li>negative zero is treated as identical to integer value zero throughout luaj
<li>lua compiled into java bytecode using luajc cannot use string.dump() or xpcall() <li>lua compiled into java bytecode using luajc cannot use string.dump() or xpcall()
<li>number formatting with string.format() is not supported
<li>date formatting with os.date() is not supported
</ul> </ul>

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

@@ -304,8 +304,8 @@ public class OsLib extends TwoArgFunction {
* @param table * @param table
* @return long value for the time * @return long value for the time
*/ */
protected long time(LuaTable table) { protected double time(LuaTable table) {
return System.currentTimeMillis(); return System.currentTimeMillis() / 1000.0;
} }
/** /**