diff options
author | Stefan Radomski <github@mintwerk.de> | 2017-01-18 17:15:46 (GMT) |
---|---|---|
committer | Stefan Radomski <github@mintwerk.de> | 2017-01-18 17:15:46 (GMT) |
commit | fc78cfdc4d1f5bba8dbd6a412f23651e185cb191 (patch) | |
tree | dd32929c07e6c19250f2e8fde1e73712bab0c6fb /src/uscxml/plugins/Factory.cpp | |
parent | 01ee860a88b5c8cf25fb7dcc145662d2c27f3ebe (diff) | |
download | uscxml-fc78cfdc4d1f5bba8dbd6a412f23651e185cb191.zip uscxml-fc78cfdc4d1f5bba8dbd6a412f23651e185cb191.tar.gz uscxml-fc78cfdc4d1f5bba8dbd6a412f23651e185cb191.tar.bz2 |
Worked on passing even more IRP tests
Diffstat (limited to 'src/uscxml/plugins/Factory.cpp')
-rw-r--r-- | src/uscxml/plugins/Factory.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/uscxml/plugins/Factory.cpp b/src/uscxml/plugins/Factory.cpp index 443cb59..60e7a3e 100644 --- a/src/uscxml/plugins/Factory.cpp +++ b/src/uscxml/plugins/Factory.cpp @@ -106,7 +106,6 @@ void Factory::registerPlugins() { } #endif - #ifdef WITH_DM_ECMA_V8 { V8DataModel* dataModel = new V8DataModel(); @@ -352,12 +351,12 @@ bool Factory::hasIOProcessor(const std::string& type) { return false; } -std::shared_ptr<IOProcessorImpl> Factory::createIOProcessor(const std::string& type, InterpreterImpl* interpreter) { +std::shared_ptr<IOProcessorImpl> Factory::createIOProcessor(const std::string& type, IOProcessorCallbacks* callbacks) { // do we have this type ourself? if (_ioProcessorAliases.find(type) != _ioProcessorAliases.end()) { std::string canonicalName = _ioProcessorAliases[type]; if (_ioProcessors.find(canonicalName) != _ioProcessors.end()) { - std::shared_ptr<IOProcessorImpl> ioProc = _ioProcessors[canonicalName]->create(interpreter); + std::shared_ptr<IOProcessorImpl> ioProc = _ioProcessors[canonicalName]->create(callbacks); // ioProc->setInterpreter(interpreter); return ioProc; } @@ -365,7 +364,7 @@ std::shared_ptr<IOProcessorImpl> Factory::createIOProcessor(const std::string& t // lookup in parent factory if (_parentFactory) { - return _parentFactory->createIOProcessor(type, interpreter); + return _parentFactory->createIOProcessor(type, callbacks); } else { ERROR_EXECUTION_THROW("No IOProcessor named '" + type + "' known"); } @@ -497,9 +496,9 @@ void IOProcessorImpl::eventToSCXML(Event& event, event.origintype = type; if (internal) { - _interpreter->enqueueInternal(event); + _callbacks->enqueueInternal(event); } else { - _interpreter->enqueueExternal(event); + _callbacks->enqueueExternal(event); } } @@ -517,9 +516,9 @@ void InvokerImpl::eventToSCXML(Event& event, event.origintype = type; if (internal) { - _interpreter->enqueueInternal(event); + _callbacks->enqueueInternal(event); } else { - _interpreter->enqueueExternal(event); + _callbacks->enqueueExternal(event); } } |