diff options
author | daurnimator <quae@daurnimator.com> | 2018-03-30 16:39:41 +1100 |
---|---|---|
committer | daurnimator <quae@daurnimator.com> | 2018-03-30 16:42:26 +1100 |
commit | fb3b9c3b3f0ee1a04ec264d1b40bd1cccf24a999 (patch) | |
tree | 3166cfef0f1c8cde6b6662b46791dfb66f681e3d /src/lutf8lib.js | |
parent | 2f2bd7fad5342583f85e99ec67eea74fad5fafdd (diff) | |
parent | 1371afafae9144b30475262f06940c4057485d02 (diff) | |
download | fengari-fb3b9c3b3f0ee1a04ec264d1b40bd1cccf24a999.tar.gz fengari-fb3b9c3b3f0ee1a04ec264d1b40bd1cccf24a999.tar.bz2 fengari-fb3b9c3b3f0ee1a04ec264d1b40bd1cccf24a999.zip |
Merge branch 'accept-jsstrings'
Diffstat (limited to 'src/lutf8lib.js')
-rw-r--r-- | src/lutf8lib.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lutf8lib.js b/src/lutf8lib.js index 3e3e194..34d1365 100644 --- a/src/lutf8lib.js +++ b/src/lutf8lib.js @@ -85,8 +85,8 @@ const utflen = function(L) { let posi = u_posrelat(luaL_optinteger(L, 2, 1), len); let posj = u_posrelat(luaL_optinteger(L, 3, -1), len); - luaL_argcheck(L, 1 <= posi && --posi <= len, 2, to_luastring("initial position out of string")); - luaL_argcheck(L, --posj < len, 3, to_luastring("final position out of string")); + luaL_argcheck(L, 1 <= posi && --posi <= len, 2, "initial position out of string"); + luaL_argcheck(L, --posj < len, 3, "final position out of string"); while (posi <= posj) { let dec = utf8_decode(s, posi); @@ -105,7 +105,7 @@ const utflen = function(L) { const p_U = to_luastring("%U"); const pushutfchar = function(L, arg) { let code = luaL_checkinteger(L, arg); - luaL_argcheck(L, 0 <= code && code <= MAXUNICODE, arg, to_luastring("value out of range", true)); + luaL_argcheck(L, 0 <= code && code <= MAXUNICODE, arg, "value out of range"); lua_pushfstring(L, p_U, code); }; @@ -138,14 +138,14 @@ const byteoffset = function(L) { let posi = n >= 0 ? 1 : s.length + 1; posi = u_posrelat(luaL_optinteger(L, 3, posi), s.length); - luaL_argcheck(L, 1 <= posi && --posi <= s.length, 3, to_luastring("position out of range", true)); + luaL_argcheck(L, 1 <= posi && --posi <= s.length, 3, "position out of range"); if (n === 0) { /* find beginning of current byte sequence */ while (posi > 0 && iscont(s[posi])) posi--; } else { if (iscont(s[posi])) - luaL_error(L, to_luastring("initial position is a continuation byte", true)); + luaL_error(L, "initial position is a continuation byte"); if (n < 0) { while (n < 0 && posi > 0) { /* move back */ @@ -182,19 +182,19 @@ const codepoint = function(L) { let posi = u_posrelat(luaL_optinteger(L, 2, 1), s.length); let pose = u_posrelat(luaL_optinteger(L, 3, posi), s.length); - luaL_argcheck(L, posi >= 1, 2, to_luastring("out of range", true)); - luaL_argcheck(L, pose <= s.length, 3, to_luastring("out of range", true)); + luaL_argcheck(L, posi >= 1, 2, "out of range"); + luaL_argcheck(L, pose <= s.length, 3, "out of range"); if (posi > pose) return 0; /* empty interval; return no values */ if (pose - posi >= Number.MAX_SAFE_INTEGER) - return luaL_error(L, to_luastring("string slice too long", true)); + return luaL_error(L, "string slice too long"); let n = (pose - posi) + 1; - luaL_checkstack(L, n, to_luastring("string slice too long", true)); + luaL_checkstack(L, n, "string slice too long"); n = 0; for (posi -= 1; posi < pose;) { let dec = utf8_decode(s, posi); if (dec === null) - return luaL_error(L, to_luastring("invalid UTF-8 code", true)); + return luaL_error(L, "invalid UTF-8 code"); lua_pushinteger(L, dec.code); posi = dec.pos; n++; |