Skip to content

Split moveresults. #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptersilie merged 1 commit into from
May 23, 2025
Merged

Split moveresults. #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/ldo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,21 @@ StkId luaD_tryfuncTM (lua_State *L, StkId func) {
** expressions, multiple results for tail calls/single parameters)
** separated.
*/
l_sinline void moveresults (lua_State *L, StkId res, int nres, int wanted) {
l_sinline void moveresults_full (lua_State *L, StkId res, int nres, int wanted) {
StkId firstresult;
int i;
/* generic case */
firstresult = L->top.p - nres; /* index of first result */
if (nres > wanted) /* extra results? */
nres = wanted; /* don't need them */
for (i = 0; i < nres; i++) /* move all results to correct place */
setobjs2s(L, res + i, firstresult + i);
for (; i < wanted; i++) /* complete wanted number of results */
setnilvalue(s2v(res + i));
L->top.p = res + wanted; /* top points after the last result */
}

l_sinline void moveresults (lua_State *L, StkId res, int nres, int wanted) {
switch (wanted) { /* handle typical cases separately */
case 0: /* no values needed */
L->top.p = res;
Expand Down Expand Up @@ -464,15 +476,7 @@ l_sinline void moveresults (lua_State *L, StkId res, int nres, int wanted) {
}
break;
}
/* generic case */
firstresult = L->top.p - nres; /* index of first result */
if (nres > wanted) /* extra results? */
nres = wanted; /* don't need them */
for (i = 0; i < nres; i++) /* move all results to correct place */
setobjs2s(L, res + i, firstresult + i);
for (; i < wanted; i++) /* complete wanted number of results */
setnilvalue(s2v(res + i));
L->top.p = res + wanted; /* top points after the last result */
moveresults_full(L, res, nres, wanted);
}


Expand Down