api functions to manipulate upvalues do not need to check their

arguments (the caller must check them before calling)

1 files changed, 12 insertions, 19 deletions

diff --git a/lapi.c b/lapi.c
index 4d85508e..a79eb19f 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 2.94 2009/10/23 19:12:19 roberto Exp roberto $
+** $Id: lapi.c,v 2.95 2009/11/05 16:48:31 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -1092,43 +1092,36 @@ static UpVal **getupvalref (lua_State *L, int fidx, int n, Closure **pf) {
   Closure *f;
   Proto *p;
   StkId fi = index2addr(L, fidx);
-  if (!ttisfunction(fi)) return NULL;  /* not a function? */
+  api_check(L, ttisfunction(fi), "function expected");
   f = clvalue(fi);
-  if (f->c.isC) return NULL;  /* not a Lua function? */
+  api_check(L, !f->c.isC, "Lua function expected");
   p = f->l.p;
-  if (!(1 <= n && n <= p->sizeupvalues)) return NULL;
-  else {
-    if (pf) *pf = f;
-    return &f->l.upvals[n - 1];  /* get its upvalue pointer */
-  }
+  api_check(L, (1 <= n && n <= p->sizeupvalues), "invalid upvalue index");
+  if (pf) *pf = f;
+  return &f->l.upvals[n - 1];  /* get its upvalue pointer */
 }
 
 
 LUA_API void *(lua_upvaladdr) (lua_State *L, int fidx, int n) {
   Closure *f;
   StkId fi = index2addr(L, fidx);
-  if (!ttisfunction(fi)) return NULL;
+  api_check(L, ttisfunction(fi), "function expected");
   f = clvalue(fi);
   if (f->c.isC) {
-    if (!(1 <= n && n <= f->c.nupvalues)) return NULL;
-    else return &f->c.upvalue[n - 1];
-  }
-  else {
-    UpVal **uv = getupvalref(L, fidx, n, NULL);
-    return (uv == NULL) ? NULL : *uv;
+    api_check(L, 1 <= n && n <= f->c.nupvalues, "invalid upvalue index");
+    return &f->c.upvalue[n - 1];
   }
+  else return *getupvalref(L, fidx, n, NULL);
 }
 
 
-LUA_API int (lua_upvaljoin) (lua_State *L, int fidx1, int n1,
-                                           int fidx2, int n2) {
+LUA_API void (lua_upvaljoin) (lua_State *L, int fidx1, int n1,
+                                            int fidx2, int n2) {
   Closure *f1;
   UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
   UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
-  if (up1 == NULL || up2 == NULL) return 0;
   *up1 = *up2;
   luaC_objbarrier(L, f1, *up2);
-  return 1;
 }