aboutsummaryrefslogtreecommitdiff
path: root/src/loslib.js
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2018-03-30 16:39:41 +1100
committerdaurnimator <quae@daurnimator.com>2018-03-30 16:42:26 +1100
commitfb3b9c3b3f0ee1a04ec264d1b40bd1cccf24a999 (patch)
tree3166cfef0f1c8cde6b6662b46791dfb66f681e3d /src/loslib.js
parent2f2bd7fad5342583f85e99ec67eea74fad5fafdd (diff)
parent1371afafae9144b30475262f06940c4057485d02 (diff)
downloadfengari-fb3b9c3b3f0ee1a04ec264d1b40bd1cccf24a999.tar.gz
fengari-fb3b9c3b3f0ee1a04ec264d1b40bd1cccf24a999.tar.bz2
fengari-fb3b9c3b3f0ee1a04ec264d1b40bd1cccf24a999.zip
Merge branch 'accept-jsstrings'
Diffstat (limited to 'src/loslib.js')
-rw-r--r--src/loslib.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/loslib.js b/src/loslib.js
index 53a4228..6fec903 100644
--- a/src/loslib.js
+++ b/src/loslib.js
@@ -130,7 +130,7 @@ const checkoption = function(L, conv, i, buff) {
const os_date = function(L) {
- let s = luaL_optlstring(L, 1, to_luastring("%c"));
+ let s = luaL_optlstring(L, 1, "%c");
let t = luaL_opt(L, l_checktime, 2, new Date().getTime() / 1000) * 1000;
let stm = new Date(t);
let utc = false;
@@ -188,7 +188,7 @@ const os_time = function(L) {
const l_checktime = function(L, arg) {
let t = luaL_checkinteger(L, arg);
- // luaL_argcheck(L, t, arg, to_luastring("time out-of-bounds"));
+ // luaL_argcheck(L, t, arg, "time out-of-bounds");
return t;
};