diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2023-11-03 15:39:14 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2023-11-03 15:39:14 -0300 |
commit | fa075b79530af1cbc977349f2e467d69ce01202c (patch) | |
tree | 300e10cd086a9812331b954d46552dbf420b0a8a /ldo.c | |
parent | 08a077d673b25cf1fbfe21794f240f4ff4999667 (diff) | |
parent | 7923dbbf72da303ca1cca17efd24725668992f15 (diff) | |
download | lua-fa075b79530af1cbc977349f2e467d69ce01202c.tar.gz lua-fa075b79530af1cbc977349f2e467d69ce01202c.tar.bz2 lua-fa075b79530af1cbc977349f2e467d69ce01202c.zip |
Merge branch 'master' into newarray
Diffstat (limited to 'ldo.c')
-rw-r--r-- | ldo.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -409,7 +409,7 @@ static void rethook (lua_State *L, CallInfo *ci, int nres) { | |||
409 | ** stack, below original 'func', so that 'luaD_precall' can call it. Raise | 409 | ** stack, below original 'func', so that 'luaD_precall' can call it. Raise |
410 | ** an error if there is no '__call' metafield. | 410 | ** an error if there is no '__call' metafield. |
411 | */ | 411 | */ |
412 | StkId luaD_tryfuncTM (lua_State *L, StkId func) { | 412 | static StkId tryfuncTM (lua_State *L, StkId func) { |
413 | const TValue *tm; | 413 | const TValue *tm; |
414 | StkId p; | 414 | StkId p; |
415 | checkstackGCp(L, 1, func); /* space for metamethod */ | 415 | checkstackGCp(L, 1, func); /* space for metamethod */ |
@@ -568,7 +568,7 @@ int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func, | |||
568 | return -1; | 568 | return -1; |
569 | } | 569 | } |
570 | default: { /* not a function */ | 570 | default: { /* not a function */ |
571 | func = luaD_tryfuncTM(L, func); /* try to get '__call' metamethod */ | 571 | func = tryfuncTM(L, func); /* try to get '__call' metamethod */ |
572 | /* return luaD_pretailcall(L, ci, func, narg1 + 1, delta); */ | 572 | /* return luaD_pretailcall(L, ci, func, narg1 + 1, delta); */ |
573 | narg1++; | 573 | narg1++; |
574 | goto retry; /* try again */ | 574 | goto retry; /* try again */ |
@@ -609,7 +609,7 @@ CallInfo *luaD_precall (lua_State *L, StkId func, int nresults) { | |||
609 | return ci; | 609 | return ci; |
610 | } | 610 | } |
611 | default: { /* not a function */ | 611 | default: { /* not a function */ |
612 | func = luaD_tryfuncTM(L, func); /* try to get '__call' metamethod */ | 612 | func = tryfuncTM(L, func); /* try to get '__call' metamethod */ |
613 | /* return luaD_precall(L, func, nresults); */ | 613 | /* return luaD_precall(L, func, nresults); */ |
614 | goto retry; /* try again with metamethod */ | 614 | goto retry; /* try again with metamethod */ |
615 | } | 615 | } |