mirror of
https://github.com/ThePhD/sol2.git
synced 2024-03-22 13:10:44 +08:00
Fix 'expected .. received ..' message for function arguments
This commit is contained in:
parent
f9931e9172
commit
09ba220e62
|
@ -4607,7 +4607,7 @@ namespace sol {
|
|||
return true;
|
||||
}
|
||||
if (t != type::userdata && t != type::table) {
|
||||
handler(L, index, t, type::function);
|
||||
handler(L, index, type::function, t);
|
||||
return false;
|
||||
}
|
||||
// Do advanced check for call-style userdata?
|
||||
|
@ -4615,13 +4615,13 @@ namespace sol {
|
|||
lua_getmetatable(L, index);
|
||||
if (lua_isnoneornil(L, -1)) {
|
||||
lua_pop(L, 1);
|
||||
handler(L, index, t, type::function);
|
||||
handler(L, index, type::function, t);
|
||||
return false;
|
||||
}
|
||||
lua_getfield(L, -1, &callkey[0]);
|
||||
if (lua_isnoneornil(L, -1)) {
|
||||
lua_pop(L, 2);
|
||||
handler(L, index, t, type::function);
|
||||
handler(L, index, type::function, t);
|
||||
return false;
|
||||
}
|
||||
// has call, is definitely a function
|
||||
|
@ -4640,7 +4640,7 @@ namespace sol {
|
|||
return true;
|
||||
}
|
||||
if (t != type::userdata) {
|
||||
handler(L, index, t, type::function);
|
||||
handler(L, index, type::function, t);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
|
@ -194,7 +194,7 @@ namespace sol {
|
|||
return true;
|
||||
}
|
||||
if (t != type::userdata && t != type::table) {
|
||||
handler(L, index, t, type::function);
|
||||
handler(L, index, type::function, t);
|
||||
return false;
|
||||
}
|
||||
// Do advanced check for call-style userdata?
|
||||
|
@ -202,13 +202,13 @@ namespace sol {
|
|||
lua_getmetatable(L, index);
|
||||
if (lua_isnoneornil(L, -1)) {
|
||||
lua_pop(L, 1);
|
||||
handler(L, index, t, type::function);
|
||||
handler(L, index, type::function, t);
|
||||
return false;
|
||||
}
|
||||
lua_getfield(L, -1, &callkey[0]);
|
||||
if (lua_isnoneornil(L, -1)) {
|
||||
lua_pop(L, 2);
|
||||
handler(L, index, t, type::function);
|
||||
handler(L, index, type::function, t);
|
||||
return false;
|
||||
}
|
||||
// has call, is definitely a function
|
||||
|
@ -227,7 +227,7 @@ namespace sol {
|
|||
return true;
|
||||
}
|
||||
if (t != type::userdata) {
|
||||
handler(L, index, t, type::function);
|
||||
handler(L, index, type::function, t);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
Loading…
Reference in New Issue
Block a user