diff options
Diffstat (limited to 'apps/plugins/lua/lvm.h')
-rw-r--r-- | apps/plugins/lua/lvm.h | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/apps/plugins/lua/lvm.h b/apps/plugins/lua/lvm.h index 5380270da6..dff2a139f7 100644 --- a/apps/plugins/lua/lvm.h +++ b/apps/plugins/lua/lvm.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lvm.h,v 2.18.1.1 2013/04/12 18:48:47 roberto Exp $ | 2 | ** $Id$ |
3 | ** Lua virtual machine | 3 | ** Lua virtual machine |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -13,32 +13,24 @@ | |||
13 | #include "ltm.h" | 13 | #include "ltm.h" |
14 | 14 | ||
15 | 15 | ||
16 | #define tostring(L,o) (ttisstring(o) || (luaV_tostring(L, o))) | 16 | #define tostring(L,o) ((ttype(o) == LUA_TSTRING) || (luaV_tostring(L, o))) |
17 | 17 | ||
18 | #define tonumber(o,n) (ttisnumber(o) || (((o) = luaV_tonumber(o,n)) != NULL)) | 18 | #define tonumber(o,n) (ttype(o) == LUA_TNUMBER || \ |
19 | (((o) = luaV_tonumber(o,n)) != NULL)) | ||
19 | 20 | ||
20 | #define equalobj(L,o1,o2) (ttisequal(o1, o2) && luaV_equalobj_(L, o1, o2)) | 21 | #define equalobj(L,o1,o2) \ |
21 | 22 | (ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2)) | |
22 | #define luaV_rawequalobj(o1,o2) equalobj(NULL,o1,o2) | ||
23 | |||
24 | |||
25 | /* not to called directly */ | ||
26 | LUAI_FUNC int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2); | ||
27 | 23 | ||
28 | 24 | ||
29 | LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r); | 25 | LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r); |
30 | LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r); | 26 | LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2); |
31 | LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n); | 27 | LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n); |
32 | LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj); | 28 | LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj); |
33 | LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key, | 29 | LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key, |
34 | StkId val); | 30 | StkId val); |
35 | LUAI_FUNC void luaV_settable (lua_State *L, const TValue *t, TValue *key, | 31 | LUAI_FUNC void luaV_settable (lua_State *L, const TValue *t, TValue *key, |
36 | StkId val); | 32 | StkId val); |
37 | LUAI_FUNC void luaV_finishOp (lua_State *L); | 33 | LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls); |
38 | LUAI_FUNC void luaV_execute (lua_State *L); | 34 | LUAI_FUNC void luaV_concat (lua_State *L, int total, int last); |
39 | LUAI_FUNC void luaV_concat (lua_State *L, int total); | ||
40 | LUAI_FUNC void luaV_arith (lua_State *L, StkId ra, const TValue *rb, | ||
41 | const TValue *rc, TMS op); | ||
42 | LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb); | ||
43 | 35 | ||
44 | #endif | 36 | #endif |