aboutsummaryrefslogtreecommitdiff
path: root/lapi.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2013-04-12 16:07:09 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2013-04-12 16:07:09 -0300
commit8f8665fffad817d764ce03a53385f2ee08cb0a91 (patch)
treeec8ac7607d5553acdd10f096369f5b28ebc0ace8 /lapi.c
parent49c1607157560f0775f3c697cca47b06978cc3e5 (diff)
downloadlua-8f8665fffad817d764ce03a53385f2ee08cb0a91.tar.gz
lua-8f8665fffad817d764ce03a53385f2ee08cb0a91.tar.bz2
lua-8f8665fffad817d764ce03a53385f2ee08cb0a91.zip
'ttypenv' -> 'ttnov'
Diffstat (limited to 'lapi.c')
-rw-r--r--lapi.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/lapi.c b/lapi.c
index c870049b..7689c90b 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lapi.c,v 2.170 2012/12/05 19:49:55 roberto Exp roberto $ 2** $Id: lapi.c,v 2.171 2013/03/16 21:10:18 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*/
@@ -248,7 +248,7 @@ LUA_API void lua_pushvalue (lua_State *L, int idx) {
248 248
249LUA_API int lua_type (lua_State *L, int idx) { 249LUA_API int lua_type (lua_State *L, int idx) {
250 StkId o = index2addr(L, idx); 250 StkId o = index2addr(L, idx);
251 return (isvalid(o) ? ttypenv(o) : LUA_TNONE); 251 return (isvalid(o) ? ttnov(o) : LUA_TNONE);
252} 252}
253 253
254 254
@@ -406,7 +406,7 @@ LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
406 406
407LUA_API size_t lua_rawlen (lua_State *L, int idx) { 407LUA_API size_t lua_rawlen (lua_State *L, int idx) {
408 StkId o = index2addr(L, idx); 408 StkId o = index2addr(L, idx);
409 switch (ttypenv(o)) { 409 switch (ttnov(o)) {
410 case LUA_TSTRING: return tsvalue(o)->len; 410 case LUA_TSTRING: return tsvalue(o)->len;
411 case LUA_TUSERDATA: return uvalue(o)->len; 411 case LUA_TUSERDATA: return uvalue(o)->len;
412 case LUA_TTABLE: return luaH_getn(hvalue(o)); 412 case LUA_TTABLE: return luaH_getn(hvalue(o));
@@ -426,7 +426,7 @@ LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) {
426 426
427LUA_API void *lua_touserdata (lua_State *L, int idx) { 427LUA_API void *lua_touserdata (lua_State *L, int idx) {
428 StkId o = index2addr(L, idx); 428 StkId o = index2addr(L, idx);
429 switch (ttypenv(o)) { 429 switch (ttnov(o)) {
430 case LUA_TUSERDATA: return (rawuvalue(o) + 1); 430 case LUA_TUSERDATA: return (rawuvalue(o) + 1);
431 case LUA_TLIGHTUSERDATA: return pvalue(o); 431 case LUA_TLIGHTUSERDATA: return pvalue(o);
432 default: return NULL; 432 default: return NULL;
@@ -689,7 +689,7 @@ LUA_API int lua_getmetatable (lua_State *L, int objindex) {
689 int res; 689 int res;
690 lua_lock(L); 690 lua_lock(L);
691 obj = index2addr(L, objindex); 691 obj = index2addr(L, objindex);
692 switch (ttypenv(obj)) { 692 switch (ttnov(obj)) {
693 case LUA_TTABLE: 693 case LUA_TTABLE:
694 mt = hvalue(obj)->metatable; 694 mt = hvalue(obj)->metatable;
695 break; 695 break;
@@ -697,7 +697,7 @@ LUA_API int lua_getmetatable (lua_State *L, int objindex) {
697 mt = uvalue(obj)->metatable; 697 mt = uvalue(obj)->metatable;
698 break; 698 break;
699 default: 699 default:
700 mt = G(L)->mt[ttypenv(obj)]; 700 mt = G(L)->mt[ttnov(obj)];
701 break; 701 break;
702 } 702 }
703 if (mt == NULL) 703 if (mt == NULL)
@@ -821,7 +821,7 @@ LUA_API int lua_setmetatable (lua_State *L, int objindex) {
821 api_check(L, ttistable(L->top - 1), "table expected"); 821 api_check(L, ttistable(L->top - 1), "table expected");
822 mt = hvalue(L->top - 1); 822 mt = hvalue(L->top - 1);
823 } 823 }
824 switch (ttypenv(obj)) { 824 switch (ttnov(obj)) {
825 case LUA_TTABLE: { 825 case LUA_TTABLE: {
826 hvalue(obj)->metatable = mt; 826 hvalue(obj)->metatable = mt;
827 if (mt) { 827 if (mt) {
@@ -839,7 +839,7 @@ LUA_API int lua_setmetatable (lua_State *L, int objindex) {
839 break; 839 break;
840 } 840 }
841 default: { 841 default: {
842 G(L)->mt[ttypenv(obj)] = mt; 842 G(L)->mt[ttnov(obj)] = mt;
843 break; 843 break;
844 } 844 }
845 } 845 }