Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 01:57:09 +00:00
Code Issues Releases Activity

Use a named enum for lua types

Browse Source
This commit is contained in:
Pavel Labath 2010-02-25 16:47:00 +01:00
parent 9cf26becf2
commit da3ef0d2c0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/luamm.hh
View File

@ -56,7 +56,7 @@ namespace lua {
MULTRET = LUA_MULTRET MULTRET = LUA_MULTRET
}; };
enum { enum Type {
TBOOLEAN = LUA_TBOOLEAN, TBOOLEAN = LUA_TBOOLEAN,
TFUNCTION = LUA_TFUNCTION, TFUNCTION = LUA_TFUNCTION,
TLIGHTUSERDATA = LUA_TLIGHTUSERDATA, TLIGHTUSERDATA = LUA_TLIGHTUSERDATA,
@ -214,9 +214,9 @@ namespace lua {
integer tointeger(int index) throw() { return lua_tointeger(cobj.get(), index); } integer tointeger(int index) throw() { return lua_tointeger(cobj.get(), index); }
number tonumber(int index) throw() { return lua_tonumber(cobj.get(), index); } number tonumber(int index) throw() { return lua_tonumber(cobj.get(), index); }
void* touserdata(int index) throw() { return lua_touserdata(cobj.get(), index); } void* touserdata(int index) throw() { return lua_touserdata(cobj.get(), index); }
int type(int index) throw() { return lua_type(cobj.get(), index); } Type type(int index) throw() { return static_cast<Type>(lua_type(cobj.get(), index)); }
// typename is a reserved word :/ // typename is a reserved word :/
const char* type_name(int tp) throw() { return lua_typename(cobj.get(), tp); } const char* type_name(Type tp) throw() { return lua_typename(cobj.get(), tp); }
void unref(int t, int ref) throw() { return luaL_unref(cobj.get(), t, ref); } void unref(int t, int ref) throw() { return luaL_unref(cobj.get(), t, ref); }
// type b, throw only on memory allocation errors // type b, throw only on memory allocation errors

2
src/setting.cc
View File

@ -79,7 +79,7 @@ namespace conky {
{ {
lua::stack_sentry s(l, -2); lua::stack_sentry s(l, -2);
int type = l.type(-3); lua::Type type = l.type(-3);
if(type != lua::TSTRING) { if(type != lua::TSTRING) {
NORM_ERR("invalid setting of type '%s'", l.type_name(type)); NORM_ERR("invalid setting of type '%s'", l.type_name(type));
return; return;