diff options
Diffstat (limited to 'src/uscxml/plugins/datamodel/lua')
| -rw-r--r-- | src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp index c55e143..c204946 100644 --- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp @@ -160,7 +160,7 @@ boost::shared_ptr<DataModelImpl> LuaDataModel::create(InterpreterInfo* interpret LOG(INFO) << e.what(); } - luabridge::getGlobalNamespace(dm->_luaState).beginClass<InterpreterImpl>("Interpreter").endClass(); + luabridge::getGlobalNamespace(dm->_luaState).beginClass<InterpreterInfo>("Interpreter").endClass(); luabridge::setGlobal(dm->_luaState, dm->_interpreter, "__interpreter"); luabridge::getGlobalNamespace(dm->_luaState).addCFunction("In", luaInFunction); @@ -315,7 +315,8 @@ void LuaDataModel::setEvent(const Event& event) { } Data LuaDataModel::getStringAsData(const std::string& content) { - Data data = Data::fromJSON(content); +// Data data = Data::fromJSON(content); + Data data; if (data.empty()) { std::string trimmedExpr = boost::trim_copy(content); if (!boost::starts_with(trimmedExpr, "return")) { |