summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/datamodel
diff options
context:
space:
mode:
authorStefan Radomski <github@mintwerk.de>2016-12-12 12:58:40 (GMT)
committerStefan Radomski <github@mintwerk.de>2016-12-12 12:58:40 (GMT)
commit7b55e48d57c061bd65e7718a41bfddd90084345e (patch)
treea371c34147528f5ed0a3a8e53bf6c2d52149dcc0 /src/uscxml/plugins/datamodel
parent277ca19814890939d5d0e4551e3acb651b1c42e6 (diff)
downloaduscxml-7b55e48d57c061bd65e7718a41bfddd90084345e.zip
uscxml-7b55e48d57c061bd65e7718a41bfddd90084345e.tar.gz
uscxml-7b55e48d57c061bd65e7718a41bfddd90084345e.tar.bz2
Added test / example for pausable eventqueue
Diffstat (limited to 'src/uscxml/plugins/datamodel')
-rw-r--r--src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
index 59c2427..55c4501 100644
--- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
@@ -326,7 +326,7 @@ void LuaDataModel::setEvent(const Event& event) {
Data LuaDataModel::evalAsData(const std::string& content) {
Data data;
- ErrorEvent originalError;
+ ErrorEvent originalError;
std::string trimmedExpr = boost::trim_copy(content);
@@ -338,31 +338,31 @@ Data LuaDataModel::evalAsData(const std::string& content) {
lua_pop(_luaState, retVals);
return data;
} catch (ErrorEvent e) {
- originalError = e;
+ originalError = e;
}
- int retVals = 0;
+ int retVals = 0;
try {
// evaluate again without the return()
retVals = luaEval(_luaState, trimmedExpr);
- } catch (ErrorEvent e) {
- throw originalError; // we will assume syntax error and throw
- }
+ } catch (ErrorEvent e) {
+ throw originalError; // we will assume syntax error and throw
+ }
- if (retVals == 0)
- throw originalError; // we will assume syntax error and throw
+ if (retVals == 0)
+ throw originalError; // we will assume syntax error and throw
-
- try {
+
+ try {
if (retVals == 1) {
data = getLuaAsData(_luaState, luabridge::LuaRef::fromStack(_luaState, -1));
}
lua_pop(_luaState, retVals);
return data;
-
- } catch (ErrorEvent e) {
- throw e; // we will assume syntax error and throw
- }
+
+ } catch (ErrorEvent e) {
+ throw e; // we will assume syntax error and throw
+ }
return data;