new macros + new names to facilitate compilation of threaded version

1 files changed, 104 insertions, 104 deletions

diff --git a/lapi.c b/lapi.c
index d9229444..26563daf 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 1.119 2001/01/24 15:45:33 roberto Exp roberto $
+** $Id: lapi.c,v 1.120 2001/01/25 16:45:36 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -55,9 +55,9 @@ void luaA_pushobject (lua_State *L, const TObject *o) {
 
 LUA_API int lua_stackspace (lua_State *L) {
   int i;
-  LUA_ENTRY;
+  LUA_LOCK;
   i = (L->stack_last - L->top);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return i;
 }
 
@@ -70,49 +70,49 @@ LUA_API int lua_stackspace (lua_State *L) {
 
 LUA_API int lua_gettop (lua_State *L) {
   int i;
-  LUA_ENTRY;
+  LUA_LOCK;
   i = (L->top - L->Cbase);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return i;
 }
 
 
 LUA_API void lua_settop (lua_State *L, int index) {
-  LUA_ENTRY;
+  LUA_LOCK;
   if (index >= 0)
     luaD_adjusttop(L, L->Cbase, index);
   else
     L->top = L->top+index+1;  /* index is negative */
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_remove (lua_State *L, int index) {
   StkId p;
-  LUA_ENTRY;
+  LUA_LOCK;
   p = luaA_index(L, index);
   while (++p < L->top) setobj(p-1, p);
   L->top--;
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_insert (lua_State *L, int index) {
   StkId p;
   StkId q;
-  LUA_ENTRY;
+  LUA_LOCK;
   p = luaA_index(L, index);
   for (q = L->top; q>p; q--) setobj(q, q-1);
   setobj(p, L->top);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_pushvalue (lua_State *L, int index) {
-  LUA_ENTRY;
+  LUA_LOCK;
   setobj(L->top, luaA_index(L, index));
   api_incr_top(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
@@ -125,19 +125,19 @@ LUA_API void lua_pushvalue (lua_State *L, int index) {
 LUA_API int lua_type (lua_State *L, int index) {
   StkId o;
   int i;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   i = (o == NULL) ? LUA_TNONE : ttype(o);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return i;
 }
 
 
 LUA_API const char *lua_typename (lua_State *L, int t) {
   const char *s;
-  LUA_ENTRY;
+  LUA_LOCK;
   s = (t == LUA_TNONE) ? "no value" : basictypename(G(L), t);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return s;
 }
 
@@ -145,10 +145,10 @@ LUA_API const char *lua_typename (lua_State *L, int t) {
 LUA_API const char *lua_xtype (lua_State *L, int index) {
   StkId o;
   const char *type;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   type = (o == NULL) ? "no value" : luaT_typename(G(L), o);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return type;
 }
 
@@ -156,20 +156,20 @@ LUA_API const char *lua_xtype (lua_State *L, int index) {
 LUA_API int lua_iscfunction (lua_State *L, int index) {
   StkId o;
   int i;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   i = (o == NULL) ? 0 : iscfunction(o);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return i;
 }
 
 LUA_API int lua_isnumber (lua_State *L, int index) {
   TObject *o;
   int i;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   i = (o == NULL) ? 0 : (tonumber(o) == 0);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return i;
 }
 
@@ -182,34 +182,34 @@ LUA_API int lua_isstring (lua_State *L, int index) {
 LUA_API int lua_tag (lua_State *L, int index) {
   StkId o;
   int i;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   i = (o == NULL) ? LUA_NOTAG : luaT_tag(o);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return i;
 }
 
 LUA_API int lua_equal (lua_State *L, int index1, int index2) {
   StkId o1, o2;
   int i;
-  LUA_ENTRY;
+  LUA_LOCK;
   o1 = luaA_indexAcceptable(L, index1);
   o2 = luaA_indexAcceptable(L, index2);
   i = (o1 == NULL || o2 == NULL) ? 0  /* index out-of-range */
                                  : luaO_equalObj(o1, o2);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return i;
 }
 
 LUA_API int lua_lessthan (lua_State *L, int index1, int index2) {
   StkId o1, o2;
   int i;
-  LUA_ENTRY;
+  LUA_LOCK;
   o1 = luaA_indexAcceptable(L, index1);
   o2 = luaA_indexAcceptable(L, index2);
   i = (o1 == NULL || o2 == NULL) ? 0  /* index out-of-range */
                                  : luaV_lessthan(L, o1, o2, L->top);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return i;
 }
 
@@ -218,58 +218,58 @@ LUA_API int lua_lessthan (lua_State *L, int index1, int index2) {
 LUA_API lua_Number lua_tonumber (lua_State *L, int index) {
   StkId o;
   lua_Number n;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   n = (o == NULL || tonumber(o)) ? 0 : nvalue(o);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return n;
 }
 
 LUA_API const char *lua_tostring (lua_State *L, int index) {
   StkId o;
   const char *s;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   s = (o == NULL || tostring(L, o)) ? NULL : svalue(o);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return s;
 }
 
 LUA_API size_t lua_strlen (lua_State *L, int index) {
   StkId o;
   size_t l;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   l = (o == NULL || tostring(L, o)) ? 0 : tsvalue(o)->len;
-  LUA_EXIT;
+  LUA_UNLOCK;
   return l;
 }
 
 LUA_API lua_CFunction lua_tocfunction (lua_State *L, int index) {
   StkId o;
   lua_CFunction f;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   f = (o == NULL || !iscfunction(o)) ? NULL : clvalue(o)->f.c;
-  LUA_EXIT;
+  LUA_UNLOCK;
   return f;
 }
 
 LUA_API void *lua_touserdata (lua_State *L, int index) {
   StkId o;
   void *p;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   p = (o == NULL || ttype(o) != LUA_TUSERDATA) ? NULL :
                                                     tsvalue(o)->u.d.value;
-  LUA_EXIT;
+  LUA_UNLOCK;
   return p;
 }
 
 LUA_API const void *lua_topointer (lua_State *L, int index) {
   StkId o;
   const void *p;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = luaA_indexAcceptable(L, index);
   if (o == NULL) p = NULL;
   else {
@@ -285,7 +285,7 @@ LUA_API const void *lua_topointer (lua_State *L, int index) {
         break;
     }
   }
-  LUA_EXIT;
+  LUA_UNLOCK;
   return p;
 }
 
@@ -297,26 +297,26 @@ LUA_API const void *lua_topointer (lua_State *L, int index) {
 
 
 LUA_API void lua_pushnil (lua_State *L) {
-  LUA_ENTRY;
+  LUA_LOCK;
   setnilvalue(L->top);
   api_incr_top(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
-  LUA_ENTRY;
+  LUA_LOCK;
   setnvalue(L->top, n);
   api_incr_top(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
-  LUA_ENTRY;
+  LUA_LOCK;
   setsvalue(L->top, luaS_newlstr(L, s, len));
   api_incr_top(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
@@ -329,20 +329,20 @@ LUA_API void lua_pushstring (lua_State *L, const char *s) {
 
 
 LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
-  LUA_ENTRY;
+  LUA_LOCK;
   luaV_Cclosure(L, fn, n);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_pushusertag (lua_State *L, void *u, int tag) {
-  LUA_ENTRY;
+  LUA_LOCK;
   /* ORDER LUA_T */
   if (!(tag == LUA_ANYTAG || tag == LUA_TUSERDATA || validtag(G(L), tag)))
     luaO_verror(L, "invalid tag for a userdata (%d)", tag);
   setuvalue(L->top, luaS_createudata(L, u, tag));
   api_incr_top(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
@@ -354,58 +354,58 @@ LUA_API void lua_pushusertag (lua_State *L, void *u, int tag) {
 
 LUA_API void lua_getglobal (lua_State *L, const char *name) {
   StkId top;
-  LUA_ENTRY;
+  LUA_LOCK;
   top = L->top;
   setobj(top, luaV_getglobal(L, luaS_new(L, name)));
   L->top = top;
   api_incr_top(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_gettable (lua_State *L, int index) {
   StkId t, top;
-  LUA_ENTRY;
+  LUA_LOCK;
   t = Index(L, index);
   top = L->top;
   setobj(top-1, luaV_gettable(L, t));
   L->top = top;  /* tag method may change top */
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_rawget (lua_State *L, int index) {
   StkId t;
-  LUA_ENTRY;
+  LUA_LOCK;
   t = Index(L, index);
   lua_assert(ttype(t) == LUA_TTABLE);
   setobj(L->top - 1, luaH_get(hvalue(t), L->top - 1));
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_rawgeti (lua_State *L, int index, int n) {
   StkId o;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = Index(L, index);
   lua_assert(ttype(o) == LUA_TTABLE);
   setobj(L->top, luaH_getnum(hvalue(o), n));
   api_incr_top(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_getglobals (lua_State *L) {
-  LUA_ENTRY;
+  LUA_LOCK;
   sethvalue(L->top, L->gt);
   api_incr_top(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API int lua_getref (lua_State *L, int ref) {
   int status = 1;
-  LUA_ENTRY;
+  LUA_LOCK;
   if (ref == LUA_REFNIL) {
     setnilvalue(L->top);
     api_incr_top(L);
@@ -417,16 +417,16 @@ LUA_API int lua_getref (lua_State *L, int ref) {
   }
   else
     status = 0;
-  LUA_EXIT;
+  LUA_UNLOCK;
   return status;
 }
 
 
 LUA_API void lua_newtable (lua_State *L) {
-  LUA_ENTRY;
+  LUA_LOCK;
   sethvalue(L->top, luaH_new(L, 0));
   api_incr_top(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
@@ -438,60 +438,60 @@ LUA_API void lua_newtable (lua_State *L) {
 
 LUA_API void lua_setglobal (lua_State *L, const char *name) {
   StkId top;
-  LUA_ENTRY;
+  LUA_LOCK;
   top = L->top;
   luaV_setglobal(L, luaS_new(L, name));
   L->top = top-1;  /* remove element from the top */
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_settable (lua_State *L, int index) {
   StkId t, top;
-  LUA_ENTRY;
+  LUA_LOCK;
   t = Index(L, index);
   top = L->top;
   luaV_settable(L, t, top-2);
   L->top = top-2;  /* pop index and value */
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_rawset (lua_State *L, int index) {
   StkId t;
-  LUA_ENTRY;
+  LUA_LOCK;
   t = Index(L, index);
   lua_assert(ttype(t) == LUA_TTABLE);
   setobj(luaH_set(L, hvalue(t), L->top-2), (L->top-1));
   L->top -= 2;
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_rawseti (lua_State *L, int index, int n) {
   StkId o;
-  LUA_ENTRY;
+  LUA_LOCK;
   o = Index(L, index);
   lua_assert(ttype(o) == LUA_TTABLE);
   setobj(luaH_setnum(L, hvalue(o), n), (L->top-1));
   L->top--;
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_setglobals (lua_State *L) {
   StkId newtable;
-  LUA_ENTRY;
+  LUA_LOCK;
   newtable = --L->top;
   lua_assert(ttype(newtable) == LUA_TTABLE);
   L->gt = hvalue(newtable);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API int lua_ref (lua_State *L,  int lock) {
   int ref;
-  LUA_ENTRY;
+  LUA_LOCK;
   if (ttype(L->top-1) == LUA_TNIL)
     ref = LUA_REFNIL;
   else {
@@ -508,7 +508,7 @@ LUA_API int lua_ref (lua_State *L,  int lock) {
     G(L)->refArray[ref].st = lock ? LOCK : HOLD;
   }
   L->top--;
-  LUA_EXIT;
+  LUA_UNLOCK;
   return ref;
 }
 
@@ -519,9 +519,9 @@ LUA_API int lua_ref (lua_State *L,  int lock) {
 */
 
 LUA_API void lua_rawcall (lua_State *L, int nargs, int nresults) {
-  LUA_ENTRY;
+  LUA_LOCK;
   luaD_call(L, L->top-(nargs+1), nresults);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
@@ -535,28 +535,28 @@ LUA_API void lua_rawcall (lua_State *L, int nargs, int nresults) {
 
 LUA_API int lua_getgcthreshold (lua_State *L) {
   int threshold;
-  LUA_ENTRY;
+  LUA_LOCK;
   threshold = GCscale(G(L)->GCthreshold);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return threshold;
 }
 
 LUA_API int lua_getgccount (lua_State *L) {
   int count;
-  LUA_ENTRY;
+  LUA_LOCK;
   count = GCscale(G(L)->nblocks);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return count;
 }
 
 LUA_API void lua_setgcthreshold (lua_State *L, int newthreshold) {
-  LUA_ENTRY;
+  LUA_LOCK;
   if (newthreshold > GCscale(ULONG_MAX))
     G(L)->GCthreshold = ULONG_MAX;
   else
     G(L)->GCthreshold = GCunscale(newthreshold);
   luaC_checkGC(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
@@ -566,7 +566,7 @@ LUA_API void lua_setgcthreshold (lua_State *L, int newthreshold) {
 
 LUA_API int lua_newtype (lua_State *L, const char *name, int basictype) {
   int tag;
-  LUA_ENTRY;
+  LUA_LOCK;
   if (basictype != LUA_TNONE &&
       basictype != LUA_TTABLE &&
       basictype != LUA_TUSERDATA)
@@ -574,7 +574,7 @@ LUA_API int lua_newtype (lua_State *L, const char *name, int basictype) {
   tag = luaT_newtag(L, name, basictype);
   if (tag == LUA_TNONE)
     luaO_verror(L, "type name '%.30s' already exists", name);
-  LUA_EXIT;
+  LUA_UNLOCK;
   return tag;
 }
 
@@ -582,22 +582,22 @@ LUA_API int lua_newtype (lua_State *L, const char *name, int basictype) {
 LUA_API int lua_type2tag (lua_State *L, const char *name) {
   int tag;
   const TObject *v;
-  LUA_ENTRY;
+  LUA_LOCK;
   v = luaH_getstr(G(L)->type2tag, luaS_new(L, name));
   if (ttype(v) == LUA_TNIL)
     tag = LUA_TNONE;
   else {
     lua_assert(ttype(v) == LUA_TNUMBER);
-    tag = nvalue(v);
+    tag = (int)nvalue(v);
   }
-  LUA_EXIT;
+  LUA_UNLOCK;
   return tag;
 }
 
 
 LUA_API void lua_settag (lua_State *L, int tag) {
   int basictype;
-  LUA_ENTRY;
+  LUA_LOCK;
   if (tag < 0 || tag >= G(L)->ntag)
     luaO_verror(L, "%d is not a valid tag", tag);
   basictype = G(L)->TMtable[tag].basictype;
@@ -615,25 +615,25 @@ LUA_API void lua_settag (lua_State *L, int tag) {
       luaO_verror(L, "cannot change the tag of a %.20s",
                   luaT_typename(G(L), L->top-1));
   }
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_error (lua_State *L, const char *s) {
-  LUA_ENTRY;
+  LUA_LOCK;
   luaD_error(L, s);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void lua_unref (lua_State *L, int ref) {
-  LUA_ENTRY;
+  LUA_LOCK;
   if (ref >= 0) {
     lua_assert(ref < G(L)->nref && G(L)->refArray[ref].st < 0);
     G(L)->refArray[ref].st = G(L)->refFree;
     G(L)->refFree = ref;
   }
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
@@ -641,7 +641,7 @@ LUA_API int lua_next (lua_State *L, int index) {
   StkId t;
   Node *n;
   int more;
-  LUA_ENTRY;
+  LUA_LOCK;
   t = luaA_index(L, index);
   lua_assert(ttype(t) == LUA_TTABLE);
   n = luaH_next(L, hvalue(t), luaA_index(L, -1));
@@ -655,7 +655,7 @@ LUA_API int lua_next (lua_State *L, int index) {
     L->top -= 1;  /* remove key */
     more = 0;
   }
-  LUA_EXIT;
+  LUA_UNLOCK;
   return more;
 }
 
@@ -664,7 +664,7 @@ LUA_API int lua_getn (lua_State *L, int index) {
   Hash *h;
   const TObject *value;
   int n;
-  LUA_ENTRY;
+  LUA_LOCK;
   h = hvalue(luaA_index(L, index));
   value = luaH_getstr(h, luaS_newliteral(L, "n"));  /* = h.n */
   if (ttype(value) == LUA_TNUMBER)
@@ -682,31 +682,31 @@ LUA_API int lua_getn (lua_State *L, int index) {
     }
     n = (int)max;
   }
-  LUA_EXIT;
+  LUA_UNLOCK;
   return n;
 }
 
 
 LUA_API void lua_concat (lua_State *L, int n) {
   StkId top;
-  LUA_ENTRY;
+  LUA_LOCK;
   top = L->top;
   luaV_strconc(L, n, top);
   L->top = top-(n-1);
   luaC_checkGC(L);
-  LUA_EXIT;
+  LUA_UNLOCK;
 }
 
 
 LUA_API void *lua_newuserdata (lua_State *L, size_t size) {
   TString *ts;
   void *p;
-  LUA_ENTRY;
+  LUA_LOCK;
   ts = luaS_newudata(L, size, NULL);
   setuvalue(L->top, ts);
   api_incr_top(L);
   p = ts->u.d.value;
-  LUA_EXIT;
+  LUA_UNLOCK;
   return p;
 }