diff options
| author | Stefan Radomski <sradomski@mintwerk.de> | 2016-02-08 20:51:15 (GMT) |
|---|---|---|
| committer | Stefan Radomski <sradomski@mintwerk.de> | 2016-02-08 20:51:15 (GMT) |
| commit | aba3f7d3560c93aab1b1482c840595e4928f38b5 (patch) | |
| tree | fb828eaa647ff9bebeca02c5986a4432cd135ac0 /src/uscxml/plugins/datamodel/lua | |
| parent | 703a04d5f171e20db830f225064dd3ae968eb84e (diff) | |
| download | uscxml-aba3f7d3560c93aab1b1482c840595e4928f38b5.zip uscxml-aba3f7d3560c93aab1b1482c840595e4928f38b5.tar.gz uscxml-aba3f7d3560c93aab1b1482c840595e4928f38b5.tar.bz2 | |
Some polishing for generated ANSI C machines
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")) { |