Skip to content

Commit 3a8e734

Browse files
ShadowNinjaShadowNinja
committedMay 6, 2015
Fix error messages for type-checking Lua reading functions
·
5.11.00.4.13
1 parent 3f5c2de commit 3a8e734

File tree

1 file changed

+40
-17
lines changed

1 file changed

+40
-17
lines changed
 

‎src/script/common/c_converter.cpp

+40-17
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,19 @@ extern "C" {
2626
#include "common/c_converter.h"
2727
#include "constants.h"
2828

29+
30+
#define CHECK_TYPE(index, name, type) do { \
31+
int t = lua_type(L, (index)); \
32+
if (t != (type)) { \
33+
throw LuaError(std::string("Invalid ") + (name) + \
34+
" (expected " + lua_typename(L, (type)) + \
35+
" got " + lua_typename(L, t) + ")."); \
36+
} \
37+
} while(0)
38+
#define CHECK_POS_COORD(name) CHECK_TYPE(-1, "position coordinate '" name "'", LUA_TNUMBER)
39+
#define CHECK_POS_TAB(index) CHECK_TYPE(index, "position", LUA_TTABLE)
40+
41+
2942
void push_v3f(lua_State *L, v3f p)
3043
{
3144
lua_newtable(L);
@@ -49,7 +62,7 @@ void push_v2f(lua_State *L, v2f p)
4962
v2s16 read_v2s16(lua_State *L, int index)
5063
{
5164
v2s16 p;
52-
luaL_checktype(L, index, LUA_TTABLE);
65+
CHECK_POS_TAB(index);
5366
lua_getfield(L, index, "x");
5467
p.X = lua_tonumber(L, -1);
5568
lua_pop(L, 1);
@@ -62,20 +75,22 @@ v2s16 read_v2s16(lua_State *L, int index)
6275
v2s16 check_v2s16(lua_State *L, int index)
6376
{
6477
v2s16 p;
65-
luaL_checktype(L, index, LUA_TTABLE);
78+
CHECK_POS_TAB(index);
6679
lua_getfield(L, index, "x");
67-
p.X = luaL_checknumber(L, -1);
80+
CHECK_POS_COORD("x");
81+
p.X = lua_tonumber(L, -1);
6882
lua_pop(L, 1);
6983
lua_getfield(L, index, "y");
70-
p.Y = luaL_checknumber(L, -1);
84+
CHECK_POS_COORD("y");
85+
p.Y = lua_tonumber(L, -1);
7186
lua_pop(L, 1);
7287
return p;
7388
}
7489

7590
v2s32 read_v2s32(lua_State *L, int index)
7691
{
7792
v2s32 p;
78-
luaL_checktype(L, index, LUA_TTABLE);
93+
CHECK_POS_TAB(index);
7994
lua_getfield(L, index, "x");
8095
p.X = lua_tonumber(L, -1);
8196
lua_pop(L, 1);
@@ -88,7 +103,8 @@ v2s32 read_v2s32(lua_State *L, int index)
88103
v2f read_v2f(lua_State *L, int index)
89104
{
90105
v2f p;
91-
luaL_checktype(L, index, LUA_TTABLE);
106+
CHECK_POS_TAB(index);
107+
lua_getfield(L, index, "x");
92108
lua_getfield(L, index, "x");
93109
p.X = lua_tonumber(L, -1);
94110
lua_pop(L, 1);
@@ -101,20 +117,22 @@ v2f read_v2f(lua_State *L, int index)
101117
v2f check_v2f(lua_State *L, int index)
102118
{
103119
v2f p;
104-
luaL_checktype(L, index, LUA_TTABLE);
120+
CHECK_POS_TAB(index);
105121
lua_getfield(L, index, "x");
106-
p.X = luaL_checknumber(L, -1);
122+
CHECK_POS_COORD("x");
123+
p.X = lua_tonumber(L, -1);
107124
lua_pop(L, 1);
108125
lua_getfield(L, index, "y");
109-
p.Y = luaL_checknumber(L, -1);
126+
CHECK_POS_COORD("y");
127+
p.Y = lua_tonumber(L, -1);
110128
lua_pop(L, 1);
111129
return p;
112130
}
113131

114132
v3f read_v3f(lua_State *L, int index)
115133
{
116134
v3f pos;
117-
luaL_checktype(L, index, LUA_TTABLE);
135+
CHECK_POS_TAB(index);
118136
lua_getfield(L, index, "x");
119137
pos.X = lua_tonumber(L, -1);
120138
lua_pop(L, 1);
@@ -130,15 +148,18 @@ v3f read_v3f(lua_State *L, int index)
130148
v3f check_v3f(lua_State *L, int index)
131149
{
132150
v3f pos;
133-
luaL_checktype(L, index, LUA_TTABLE);
151+
CHECK_POS_TAB(index);
134152
lua_getfield(L, index, "x");
135-
pos.X = luaL_checknumber(L, -1);
153+
CHECK_POS_COORD("x");
154+
pos.X = lua_tonumber(L, -1);
136155
lua_pop(L, 1);
137156
lua_getfield(L, index, "y");
138-
pos.Y = luaL_checknumber(L, -1);
157+
CHECK_POS_COORD("y");
158+
pos.Z = lua_tonumber(L, -1);
139159
lua_pop(L, 1);
140160
lua_getfield(L, index, "z");
141-
pos.Z = luaL_checknumber(L, -1);
161+
CHECK_POS_COORD("z");
162+
pos.Z = lua_tonumber(L, -1);
142163
lua_pop(L, 1);
143164
return pos;
144165
}
@@ -182,7 +203,7 @@ v3s16 check_v3s16(lua_State *L, int index)
182203
video::SColor readARGB8(lua_State *L, int index)
183204
{
184205
video::SColor color(0);
185-
luaL_checktype(L, index, LUA_TTABLE);
206+
CHECK_TYPE(index, "ARGB color", LUA_TTABLE);
186207
lua_getfield(L, index, "a");
187208
if(lua_isnumber(L, -1))
188209
color.setAlpha(lua_tonumber(L, -1));
@@ -378,9 +399,11 @@ std::string checkstringfield(lua_State *L, int table,
378399
const char *fieldname)
379400
{
380401
lua_getfield(L, table, fieldname);
381-
std::string s = luaL_checkstring(L, -1);
402+
CHECK_TYPE(-1, std::string("field \"") + fieldname + '"', LUA_TSTRING);
403+
size_t len;
404+
const char *s = lua_tolstring(L, -1, &len);
382405
lua_pop(L, 1);
383-
return s;
406+
return std::string(s, len);
384407
}
385408

386409
std::string getstringfield_default(lua_State *L, int table,

0 commit comments

Comments
 (0)
Please sign in to comment.