summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2018-01-29 15:12:26 +1100
committerdaurnimator <quae@daurnimator.com>2018-01-29 22:05:55 +1100
commit429c9e04911b5ab4700ae5bdffab46a4bf3211ba (patch)
treef8ea68d008429c8f00d81987836296aab168223f
parent4b061b1658a53c202bf3d05d5babc697c2980f86 (diff)
downloadfengari-429c9e04911b5ab4700ae5bdffab46a4bf3211ba.tar.gz
fengari-429c9e04911b5ab4700ae5bdffab46a4bf3211ba.tar.bz2
fengari-429c9e04911b5ab4700ae5bdffab46a4bf3211ba.zip
src/llex.js: Fix double llimits require
-rw-r--r--src/llex.js13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/llex.js b/src/llex.js
index 323ea73..2c3e166 100644
--- a/src/llex.js
+++ b/src/llex.js
@@ -5,7 +5,11 @@ const {
thread_status: { LUA_ERRSYNTAX },
to_luastring
} = require('./defs.js');
-const { lua_assert } = require('./llimits.js');
+const {
+ LUA_MINBUFFER,
+ MAX_INT,
+ lua_assert
+} = require('./llimits.js');
const ldebug = require('./ldebug.js');
const ldo = require('./ldo.js');
const ljstype = require('./ljstype.js');
@@ -17,7 +21,6 @@ const {
luaS_new
} = require('./lstring.js');
const ltable = require('./ltable.js');
-const llimits = require('./llimits.js');
const {
EOZ,
luaZ_buffer,
@@ -158,7 +161,7 @@ class LexState {
const save = function(ls, c) {
let b = ls.buff;
if (b.n + 1 > b.buffer.length) {
- if (b.buffer.length >= llimits.MAX_INT/2)
+ if (b.buffer.length >= MAX_INT/2)
lexerror(ls, to_luastring("lexical element too long", true), 0);
let newsize = b.buffer.length*2;
luaZ_resizebuffer(ls.L, b, newsize);
@@ -221,7 +224,7 @@ const inclinenumber = function(ls) {
next(ls); /* skip '\n' or '\r' */
if (currIsNewline(ls) && ls.current !== old)
next(ls); /* skip '\n\r' or '\r\n' */
- if (++ls.linenumber >= llimits.MAX_INT)
+ if (++ls.linenumber >= MAX_INT)
lexerror(ls, to_luastring("chunk has too many lines", true), 0);
};
@@ -242,7 +245,7 @@ const luaX_setinput = function(L, ls, z, source, firstchar) {
ls.lastline = 1;
ls.source = source;
ls.envn = luaS_bless(L, LUA_ENV);
- luaZ_resizebuffer(L, ls.buff, llimits.LUA_MINBUFFER); /* initialize buffer */
+ luaZ_resizebuffer(L, ls.buff, LUA_MINBUFFER); /* initialize buffer */
};
const check_next1 = function(ls, c) {