Skip to content

Commit 8356294

Browse files
khvzakkhvzak
committed
Lua 5.4.7
1 parent f511bac commit 8356294

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+350
-251
lines changed

‎lua-5.4.6/lapi.c ‎lua-5.4.7/lapi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,9 @@ LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
417417
o = index2value(L, idx); /* previous call may reallocate the stack */
418418
}
419419
if (len != NULL)
420-
*len = vslen(o);
420+
*len = tsslen(tsvalue(o));
421421
lua_unlock(L);
422-
return svalue(o);
422+
return getstr(tsvalue(o));
423423
}
424424

425425

‎lua-5.4.6/lapi.h ‎lua-5.4.7/lapi.h

File renamed without changes.

‎lua-5.4.6/lauxlib.c ‎lua-5.4.7/lauxlib.c

+21-7
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ static int pushglobalfuncname (lua_State *L, lua_Debug *ar) {
8080
int top = lua_gettop(L);
8181
lua_getinfo(L, "f", ar); /* push function */
8282
lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
83+
luaL_checkstack(L, 6, "not enough stack"); /* slots for 'findfield' */
8384
if (findfield(L, top + 1, 2)) {
8485
const char *name = lua_tostring(L, -1);
8586
if (strncmp(name, LUA_GNAME ".", 3) == 0) { /* name start with '_G.'? */
@@ -249,11 +250,13 @@ LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
249250
return 1;
250251
}
251252
else {
253+
const char *msg;
252254
luaL_pushfail(L);
255+
msg = (en != 0) ? strerror(en) : "(no extra info)";
253256
if (fname)
254-
lua_pushfstring(L, "%s: %s", fname, strerror(en));
257+
lua_pushfstring(L, "%s: %s", fname, msg);
255258
else
256-
lua_pushstring(L, strerror(en));
259+
lua_pushstring(L, msg);
257260
lua_pushinteger(L, en);
258261
return 3;
259262
}
@@ -732,9 +735,12 @@ static const char *getF (lua_State *L, void *ud, size_t *size) {
732735

733736

734737
static int errfile (lua_State *L, const char *what, int fnameindex) {
735-
const char *serr = strerror(errno);
738+
int err = errno;
736739
const char *filename = lua_tostring(L, fnameindex) + 1;
737-
lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
740+
if (err != 0)
741+
lua_pushfstring(L, "cannot %s %s: %s", what, filename, strerror(err));
742+
else
743+
lua_pushfstring(L, "cannot %s %s", what, filename);
738744
lua_remove(L, fnameindex);
739745
return LUA_ERRFILE;
740746
}
@@ -787,6 +793,7 @@ LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
787793
}
788794
else {
789795
lua_pushfstring(L, "@%s", filename);
796+
errno = 0;
790797
lf.f = fopen(filename, "r");
791798
if (lf.f == NULL) return errfile(L, "open", fnameindex);
792799
}
@@ -796,13 +803,15 @@ LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
796803
if (c == LUA_SIGNATURE[0]) { /* binary file? */
797804
lf.n = 0; /* remove possible newline */
798805
if (filename) { /* "real" file? */
806+
errno = 0;
799807
lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */
800808
if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
801809
skipcomment(lf.f, &c); /* re-read initial portion */
802810
}
803811
}
804812
if (c != EOF)
805813
lf.buff[lf.n++] = c; /* 'c' is the first character of the stream */
814+
errno = 0;
806815
status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
807816
readstatus = ferror(lf.f);
808817
if (filename) fclose(lf.f); /* close file (even in case of errors) */
@@ -933,7 +942,7 @@ LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
933942
LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
934943
luaL_checkstack(L, nup, "too many upvalues");
935944
for (; l->name != NULL; l++) { /* fill the table with given functions */
936-
if (l->func == NULL) /* place holder? */
945+
if (l->func == NULL) /* placeholder? */
937946
lua_pushboolean(L, 0);
938947
else {
939948
int i;
@@ -1025,9 +1034,14 @@ static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
10251034
}
10261035

10271036

1037+
/*
1038+
** Standard panic funcion just prints an error message. The test
1039+
** with 'lua_type' avoids possible memory errors in 'lua_tostring'.
1040+
*/
10281041
static int panic (lua_State *L) {
1029-
const char *msg = lua_tostring(L, -1);
1030-
if (msg == NULL) msg = "error object is not a string";
1042+
const char *msg = (lua_type(L, -1) == LUA_TSTRING)
1043+
? lua_tostring(L, -1)
1044+
: "error object is not a string";
10311045
lua_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
10321046
msg);
10331047
return 0; /* return to Lua to abort */

‎lua-5.4.6/lauxlib.h ‎lua-5.4.7/lauxlib.h

File renamed without changes.

‎lua-5.4.6/lbaselib.c ‎lua-5.4.7/lbaselib.c

File renamed without changes.

‎lua-5.4.6/lcode.c ‎lua-5.4.7/lcode.c

+19-16
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
415415
/*
416416
** Format and emit an 'iAsBx' instruction.
417417
*/
418-
int luaK_codeAsBx (FuncState *fs, OpCode o, int a, int bc) {
418+
static int codeAsBx (FuncState *fs, OpCode o, int a, int bc) {
419419
unsigned int b = bc + OFFSET_sBx;
420420
lua_assert(getOpMode(o) == iAsBx);
421421
lua_assert(a <= MAXARG_A && b <= MAXARG_Bx);
@@ -671,7 +671,7 @@ static int fitsBx (lua_Integer i) {
671671

672672
void luaK_int (FuncState *fs, int reg, lua_Integer i) {
673673
if (fitsBx(i))
674-
luaK_codeAsBx(fs, OP_LOADI, reg, cast_int(i));
674+
codeAsBx(fs, OP_LOADI, reg, cast_int(i));
675675
else
676676
luaK_codek(fs, reg, luaK_intK(fs, i));
677677
}
@@ -680,7 +680,7 @@ void luaK_int (FuncState *fs, int reg, lua_Integer i) {
680680
static void luaK_float (FuncState *fs, int reg, lua_Number f) {
681681
lua_Integer fi;
682682
if (luaV_flttointeger(f, &fi, F2Ieq) && fitsBx(fi))
683-
luaK_codeAsBx(fs, OP_LOADF, reg, cast_int(fi));
683+
codeAsBx(fs, OP_LOADF, reg, cast_int(fi));
684684
else
685685
luaK_codek(fs, reg, luaK_numberK(fs, f));
686686
}
@@ -776,7 +776,8 @@ void luaK_dischargevars (FuncState *fs, expdesc *e) {
776776
break;
777777
}
778778
case VLOCAL: { /* already in a register */
779-
e->u.info = e->u.var.ridx;
779+
int temp = e->u.var.ridx;
780+
e->u.info = temp; /* (can't do a direct assignment; values overlap) */
780781
e->k = VNONRELOC; /* becomes a non-relocatable value */
781782
break;
782783
}
@@ -1025,7 +1026,7 @@ static int luaK_exp2K (FuncState *fs, expdesc *e) {
10251026
** in the range of R/K indices).
10261027
** Returns 1 iff expression is K.
10271028
*/
1028-
int luaK_exp2RK (FuncState *fs, expdesc *e) {
1029+
static int exp2RK (FuncState *fs, expdesc *e) {
10291030
if (luaK_exp2K(fs, e))
10301031
return 1;
10311032
else { /* not a constant in the right range: put it in a register */
@@ -1037,7 +1038,7 @@ int luaK_exp2RK (FuncState *fs, expdesc *e) {
10371038

10381039
static void codeABRK (FuncState *fs, OpCode o, int a, int b,
10391040
expdesc *ec) {
1040-
int k = luaK_exp2RK(fs, ec);
1041+
int k = exp2RK(fs, ec);
10411042
luaK_codeABCk(fs, o, a, b, ec->u.info, k);
10421043
}
10431044

@@ -1215,7 +1216,7 @@ static void codenot (FuncState *fs, expdesc *e) {
12151216

12161217

12171218
/*
1218-
** Check whether expression 'e' is a small literal string
1219+
** Check whether expression 'e' is a short literal string
12191220
*/
12201221
static int isKstr (FuncState *fs, expdesc *e) {
12211222
return (e->k == VK && !hasjumps(e) && e->u.info <= MAXARG_B &&
@@ -1225,7 +1226,7 @@ static int isKstr (FuncState *fs, expdesc *e) {
12251226
/*
12261227
** Check whether expression 'e' is a literal integer.
12271228
*/
1228-
int luaK_isKint (expdesc *e) {
1229+
static int isKint (expdesc *e) {
12291230
return (e->k == VKINT && !hasjumps(e));
12301231
}
12311232

@@ -1235,7 +1236,7 @@ int luaK_isKint (expdesc *e) {
12351236
** proper range to fit in register C
12361237
*/
12371238
static int isCint (expdesc *e) {
1238-
return luaK_isKint(e) && (l_castS2U(e->u.ival) <= l_castS2U(MAXARG_C));
1239+
return isKint(e) && (l_castS2U(e->u.ival) <= l_castS2U(MAXARG_C));
12391240
}
12401241

12411242

@@ -1244,7 +1245,7 @@ static int isCint (expdesc *e) {
12441245
** proper range to fit in register sC
12451246
*/
12461247
static int isSCint (expdesc *e) {
1247-
return luaK_isKint(e) && fitsC(e->u.ival);
1248+
return isKint(e) && fitsC(e->u.ival);
12481249
}
12491250

12501251

@@ -1283,15 +1284,17 @@ void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
12831284
if (t->k == VUPVAL && !isKstr(fs, k)) /* upvalue indexed by non 'Kstr'? */
12841285
luaK_exp2anyreg(fs, t); /* put it in a register */
12851286
if (t->k == VUPVAL) {
1286-
t->u.ind.t = t->u.info; /* upvalue index */
1287-
t->u.ind.idx = k->u.info; /* literal string */
1287+
int temp = t->u.info; /* upvalue index */
1288+
lua_assert(isKstr(fs, k));
1289+
t->u.ind.t = temp; /* (can't do a direct assignment; values overlap) */
1290+
t->u.ind.idx = k->u.info; /* literal short string */
12881291
t->k = VINDEXUP;
12891292
}
12901293
else {
12911294
/* register index of the table */
12921295
t->u.ind.t = (t->k == VLOCAL) ? t->u.var.ridx: t->u.info;
12931296
if (isKstr(fs, k)) {
1294-
t->u.ind.idx = k->u.info; /* literal string */
1297+
t->u.ind.idx = k->u.info; /* literal short string */
12951298
t->k = VINDEXSTR;
12961299
}
12971300
else if (isCint(k)) {
@@ -1459,7 +1462,7 @@ static void codebinK (FuncState *fs, BinOpr opr,
14591462
*/
14601463
static int finishbinexpneg (FuncState *fs, expdesc *e1, expdesc *e2,
14611464
OpCode op, int line, TMS event) {
1462-
if (!luaK_isKint(e2))
1465+
if (!isKint(e2))
14631466
return 0; /* not an integer constant */
14641467
else {
14651468
lua_Integer i2 = e2->u.ival;
@@ -1592,7 +1595,7 @@ static void codeeq (FuncState *fs, BinOpr opr, expdesc *e1, expdesc *e2) {
15921595
op = OP_EQI;
15931596
r2 = im; /* immediate operand */
15941597
}
1595-
else if (luaK_exp2RK(fs, e2)) { /* 2nd expression is constant? */
1598+
else if (exp2RK(fs, e2)) { /* 2nd expression is constant? */
15961599
op = OP_EQK;
15971600
r2 = e2->u.info; /* constant index */
15981601
}
@@ -1658,7 +1661,7 @@ void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
16581661
}
16591662
case OPR_EQ: case OPR_NE: {
16601663
if (!tonumeral(v, NULL))
1661-
luaK_exp2RK(fs, v);
1664+
exp2RK(fs, v);
16621665
/* else keep numeral, which may be an immediate operand */
16631666
break;
16641667
}

‎lua-5.4.6/lcode.h ‎lua-5.4.7/lcode.h

-3
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ typedef enum UnOpr { OPR_MINUS, OPR_BNOT, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
6161

6262
LUAI_FUNC int luaK_code (FuncState *fs, Instruction i);
6363
LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
64-
LUAI_FUNC int luaK_codeAsBx (FuncState *fs, OpCode o, int A, int Bx);
6564
LUAI_FUNC int luaK_codeABCk (FuncState *fs, OpCode o, int A,
6665
int B, int C, int k);
67-
LUAI_FUNC int luaK_isKint (expdesc *e);
6866
LUAI_FUNC int luaK_exp2const (FuncState *fs, const expdesc *e, TValue *v);
6967
LUAI_FUNC void luaK_fixline (FuncState *fs, int line);
7068
LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n);
@@ -76,7 +74,6 @@ LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e);
7674
LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e);
7775
LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e);
7876
LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
79-
LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e);
8077
LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
8178
LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
8279
LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);

‎lua-5.4.6/lcorolib.c ‎lua-5.4.7/lcorolib.c

File renamed without changes.

‎lua-5.4.6/lctype.c ‎lua-5.4.7/lctype.c

File renamed without changes.

‎lua-5.4.6/lctype.h ‎lua-5.4.7/lctype.h

File renamed without changes.

‎lua-5.4.6/ldblib.c ‎lua-5.4.7/ldblib.c

File renamed without changes.

0 commit comments

Comments
 (0)