diff options
Diffstat (limited to 'src/uscxml/plugins/datamodel/lua')
-rw-r--r-- | src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp index 6fc5ac4..67294da 100644 --- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp @@ -334,16 +334,23 @@ Data LuaDataModel::evalAsData(const std::string& content) { data = getLuaAsData(_luaState, luabridge::LuaRef::fromStack(_luaState, -1)); } lua_pop(_luaState, retVals); + return data; } catch (ErrorEvent e) { - int retVals = luaEval(_luaState, trimmedExpr); + } + + try { + // evaluate again without the return() + int retVals = luaEval(_luaState, trimmedExpr); + if (retVals == 1) { data = getLuaAsData(_luaState, luabridge::LuaRef::fromStack(_luaState, -1)); - lua_pop(_luaState, retVals); - } else { - lua_pop(_luaState, retVals); - throw e; // we will assume syntax error and throw - } - } + } + lua_pop(_luaState, retVals); + return data; + + } catch (ErrorEvent e) { + throw e; // we will assume syntax error and throw + } return data; } |