summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2014-05-18 09:49:13 (GMT)
committerRemko Tronçon <git@el-tramo.be>2014-05-18 15:49:19 (GMT)
commitfa8fd85f5c451648bb7cfbe275db19efa921d850 (patch)
tree54adc28feceef0f674fb69088effbb975e76cc1a
parent1165b03c019a2207dc58a2070b1d5ff5833b8093 (diff)
downloadswift-contrib-fa8fd85f5c451648bb7cfbe275db19efa921d850.zip
swift-contrib-fa8fd85f5c451648bb7cfbe275db19efa921d850.tar.bz2
Sluift: Add assertions on conversion
Change-Id: I641380fe7423af7b2c7be992f59244a57fb24b51
-rw-r--r--Sluift/ElementConvertors/CommandConvertor.cpp3
-rw-r--r--Sluift/Response.cpp6
2 files changed, 6 insertions, 3 deletions
diff --git a/Sluift/ElementConvertors/CommandConvertor.cpp b/Sluift/ElementConvertors/CommandConvertor.cpp
index 7fb7b22..9a2aa5f 100644
--- a/Sluift/ElementConvertors/CommandConvertor.cpp
+++ b/Sluift/ElementConvertors/CommandConvertor.cpp
@@ -183,13 +183,14 @@ void CommandConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<Command> p
availableActions.push_back(convertActionToString(action));
}
}
result["available_actions"] = Lua::valueRef(availableActions);
}
Lua::pushValue(L, result);
if (payload->getForm()) {
- convertors->convertToLuaUntyped(L, payload->getForm());
+ bool result = convertors->convertToLuaUntyped(L, payload->getForm());
+ assert(result);
lua_setfield(L, -2, "form");
}
}
diff --git a/Sluift/Response.cpp b/Sluift/Response.cpp
index 519379c..5c36a8e 100644
--- a/Sluift/Response.cpp
+++ b/Sluift/Response.cpp
@@ -53,25 +53,27 @@ static std::string getErrorString(boost::shared_ptr<ErrorPayload> error) {
}
Response::~Response() {
}
int Response::convertToLuaResult(lua_State* L) {
if (error) {
lua_pushnil(L);
lua_pushstring(L, getErrorString(error).c_str());
- Sluift::globals.elementConvertor.convertToLuaUntyped(L, error);
+ bool converted = Sluift::globals.elementConvertor.convertToLuaUntyped(L, error);
+ assert(converted);
Lua::registerTableToString(L, -1);
return 3;
}
else {
if (result) {
- Sluift::globals.elementConvertor.convertToLuaUntyped(L, result);
+ bool converted = Sluift::globals.elementConvertor.convertToLuaUntyped(L, result);
+ assert(converted);
Lua::registerTableToString(L, -1);
}
else {
lua_pushboolean(L, 1);
}
return 1;
}
}