aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lapi.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/lapi.c b/lapi.c
index 88552899..157c22b2 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lapi.c,v 2.291 2018/04/04 14:23:41 roberto Exp roberto $ 2** $Id: lapi.c,v 2.292 2018/06/01 17:40:38 roberto Exp roberto $
3** Lua API 3** Lua API
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -51,14 +51,6 @@ static const TValue nonvalidvaluep = {NILCONSTANT};
51/* test for upvalue */ 51/* test for upvalue */
52#define isupvalue(i) ((i) < LUA_REGISTRYINDEX) 52#define isupvalue(i) ((i) < LUA_REGISTRYINDEX)
53 53
54/* test for valid but not pseudo index */
55#define isstackindex(i, o) (isvalid(o) && !ispseudo(i))
56
57#define api_checkvalidindex(l,o) api_check(l, isvalid(o), "invalid index")
58
59#define api_checkstackindex(l, i, o) \
60 api_check(l, isstackindex(i, o), "index not in the stack")
61
62 54
63static TValue *index2value (lua_State *L, int idx) { 55static TValue *index2value (lua_State *L, int idx) {
64 CallInfo *ci = L->ci; 56 CallInfo *ci = L->ci;
@@ -233,7 +225,7 @@ LUA_API void lua_copy (lua_State *L, int fromidx, int toidx) {
233 lua_lock(L); 225 lua_lock(L);
234 fr = index2value(L, fromidx); 226 fr = index2value(L, fromidx);
235 to = index2value(L, toidx); 227 to = index2value(L, toidx);
236 api_checkvalidindex(L, to); 228 api_check(l, isvalid(to), "invalid index");
237 setobj(L, to, fr); 229 setobj(L, to, fr);
238 if (isupvalue(toidx)) /* function upvalue? */ 230 if (isupvalue(toidx)) /* function upvalue? */
239 luaC_barrier(L, clCvalue(s2v(L->ci->func)), fr); 231 luaC_barrier(L, clCvalue(s2v(L->ci->func)), fr);