aboutsummaryrefslogtreecommitdiff
path: root/lstate.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2023-11-03 15:39:14 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2023-11-03 15:39:14 -0300
commitfa075b79530af1cbc977349f2e467d69ce01202c (patch)
tree300e10cd086a9812331b954d46552dbf420b0a8a /lstate.c
parent08a077d673b25cf1fbfe21794f240f4ff4999667 (diff)
parent7923dbbf72da303ca1cca17efd24725668992f15 (diff)
downloadlua-fa075b79530af1cbc977349f2e467d69ce01202c.tar.gz
lua-fa075b79530af1cbc977349f2e467d69ce01202c.tar.bz2
lua-fa075b79530af1cbc977349f2e467d69ce01202c.zip
Merge branch 'master' into newarray
Diffstat (limited to 'lstate.c')
-rw-r--r--lstate.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lstate.c b/lstate.c
index d10cd88c..390e9c1a 100644
--- a/lstate.c
+++ b/lstate.c
@@ -119,7 +119,7 @@ CallInfo *luaE_extendCI (lua_State *L) {
119/* 119/*
120** free all CallInfo structures not in use by a thread 120** free all CallInfo structures not in use by a thread
121*/ 121*/
122void luaE_freeCI (lua_State *L) { 122static void freeCI (lua_State *L) {
123 CallInfo *ci = L->ci; 123 CallInfo *ci = L->ci;
124 CallInfo *next = ci->next; 124 CallInfo *next = ci->next;
125 ci->next = NULL; 125 ci->next = NULL;
@@ -204,7 +204,7 @@ static void freestack (lua_State *L) {
204 if (L->stack.p == NULL) 204 if (L->stack.p == NULL)
205 return; /* stack not completely built yet */ 205 return; /* stack not completely built yet */
206 L->ci = &L->base_ci; /* free the entire 'ci' list */ 206 L->ci = &L->base_ci; /* free the entire 'ci' list */
207 luaE_freeCI(L); 207 freeCI(L);
208 lua_assert(L->nci == 0); 208 lua_assert(L->nci == 0);
209 luaM_freearray(L, L->stack.p, stacksize(L) + EXTRA_STACK); /* free stack */ 209 luaM_freearray(L, L->stack.p, stacksize(L) + EXTRA_STACK); /* free stack */
210} 210}
@@ -436,7 +436,7 @@ void luaE_warning (lua_State *L, const char *msg, int tocont) {
436void luaE_warnerror (lua_State *L, const char *where) { 436void luaE_warnerror (lua_State *L, const char *where) {
437 TValue *errobj = s2v(L->top.p - 1); /* error object */ 437 TValue *errobj = s2v(L->top.p - 1); /* error object */
438 const char *msg = (ttisstring(errobj)) 438 const char *msg = (ttisstring(errobj))
439 ? svalue(errobj) 439 ? getstr(tsvalue(errobj))
440 : "error object is not a string"; 440 : "error object is not a string";
441 /* produce warning "error in %s (%s)" (where, msg) */ 441 /* produce warning "error in %s (%s)" (where, msg) */
442 luaE_warning(L, "error in ", 1); 442 luaE_warning(L, "error in ", 1);