diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2021-06-30 12:53:21 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2021-06-30 12:53:21 -0300 |
commit | dbdc74dc5502c2e05e1c1e2ac894943f418c8431 (patch) | |
tree | e5f97ad48e953a4c435f6cff0b234b87e5449697 /lvm.c | |
parent | 6a0dace25a4b5b77f0fa6911de2ba26ef0fdff2c (diff) | |
download | lua-dbdc74dc5502c2e05e1c1e2ac894943f418c8431.tar.gz lua-dbdc74dc5502c2e05e1c1e2ac894943f418c8431.tar.bz2 lua-dbdc74dc5502c2e05e1c1e2ac894943f418c8431.zip |
Simplification in the parameters of 'luaD_precall'
The parameters 'nresults' and 'delta1', in 'luaD_precall', were never
meaningful simultaneously. So, they were combined in a single parameter
'retdel'.
Diffstat (limited to 'lvm.c')
-rw-r--r-- | lvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1632,7 +1632,7 @@ void luaV_execute (lua_State *L, CallInfo *ci) { | |||
1632 | L->top = ra + b; /* top signals number of arguments */ | 1632 | L->top = ra + b; /* top signals number of arguments */ |
1633 | /* else previous instruction set top */ | 1633 | /* else previous instruction set top */ |
1634 | savepc(L); /* in case of errors */ | 1634 | savepc(L); /* in case of errors */ |
1635 | if ((newci = luaD_precall(L, ra, nresults, 0)) == NULL) | 1635 | if ((newci = luaD_precall(L, ra, nresults)) == NULL) |
1636 | updatetrap(ci); /* C call; nothing else to be done */ | 1636 | updatetrap(ci); /* C call; nothing else to be done */ |
1637 | else { /* Lua call: run function in this same C frame */ | 1637 | else { /* Lua call: run function in this same C frame */ |
1638 | ci = newci; | 1638 | ci = newci; |
@@ -1654,7 +1654,7 @@ void luaV_execute (lua_State *L, CallInfo *ci) { | |||
1654 | lua_assert(L->tbclist < base); /* no pending tbc variables */ | 1654 | lua_assert(L->tbclist < base); /* no pending tbc variables */ |
1655 | lua_assert(base == ci->func + 1); | 1655 | lua_assert(base == ci->func + 1); |
1656 | } | 1656 | } |
1657 | if (luaD_precall(L, ra, LUA_MULTRET, delta + 1)) /* Lua function? */ | 1657 | if (luaD_precall(L, ra, delta2retdel(delta))) /* Lua function? */ |
1658 | goto startfunc; /* execute the callee */ | 1658 | goto startfunc; /* execute the callee */ |
1659 | else { /* C function */ | 1659 | else { /* C function */ |
1660 | updatetrap(ci); | 1660 | updatetrap(ci); |