diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-06-18 11:55:39 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-06-18 11:55:39 (GMT) |
| commit | 0e0be07906a720ae54e4572d6ac0cb657424550d (patch) | |
| tree | 7d48c87a9142a5dad06570ca4daf0212475d83f1 /src/uscxml/interpreter/BasicContentExecutor.cpp | |
| parent | 84bbbd42c3480c40c0355c64899f99f8d588d5c0 (diff) | |
| download | uscxml-0e0be07906a720ae54e4572d6ac0cb657424550d.zip uscxml-0e0be07906a720ae54e4572d6ac0cb657424550d.tar.gz uscxml-0e0be07906a720ae54e4572d6ac0cb657424550d.tar.bz2 | |
Started to port Debugger and issue 87
Diffstat (limited to 'src/uscxml/interpreter/BasicContentExecutor.cpp')
| -rw-r--r-- | src/uscxml/interpreter/BasicContentExecutor.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp index 58d3eae..0f5a67f 100644 --- a/src/uscxml/interpreter/BasicContentExecutor.cpp +++ b/src/uscxml/interpreter/BasicContentExecutor.cpp @@ -330,7 +330,7 @@ void BasicContentExecutor::process(XERCESC_NS::DOMElement* block, const X& xmlPr } try { - USCXML_MONITOR_CALLBACK1(_callbacks->getMonitor(), beforeExecutingContent, block); + USCXML_MONITOR_CALLBACK1(_callbacks->getMonitors(), beforeExecutingContent, block); if (false) { } else if (iequals(tagName, xmlPrefix.str() + "raise")) { @@ -358,12 +358,12 @@ void BasicContentExecutor::process(XERCESC_NS::DOMElement* block, const X& xmlPr Event e(exc); _callbacks->enqueueInternal(e); LOG(ERROR) << exc << std::endl; - USCXML_MONITOR_CALLBACK1(_callbacks->getMonitor(), afterExecutingContent, block); + USCXML_MONITOR_CALLBACK1(_callbacks->getMonitors(), afterExecutingContent, block); throw e; // will be catched in microstepper } - USCXML_MONITOR_CALLBACK1(_callbacks->getMonitor(), afterExecutingContent, block); + USCXML_MONITOR_CALLBACK1(_callbacks->getMonitors(), afterExecutingContent, block); } @@ -463,18 +463,18 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) { finalize = finalizes.front(); } - USCXML_MONITOR_CALLBACK2(_callbacks->getMonitor(), beforeUninvoking, element, invokeEvent.invokeid); + USCXML_MONITOR_CALLBACK2(_callbacks->getMonitors(), beforeUninvoking, element, invokeEvent.invokeid); _callbacks->invoke(type, source, autoForward, finalize, invokeEvent); - USCXML_MONITOR_CALLBACK2(_callbacks->getMonitor(), afterUninvoking, element, invokeEvent.invokeid); + USCXML_MONITOR_CALLBACK2(_callbacks->getMonitors(), afterUninvoking, element, invokeEvent.invokeid); } void BasicContentExecutor::uninvoke(XERCESC_NS::DOMElement* invoke) { char* invokeId = (char*)invoke->getUserData(X("invokeid")); assert(invokeId != NULL); - USCXML_MONITOR_CALLBACK2(_callbacks->getMonitor(), beforeUninvoking, invoke, invokeId); + USCXML_MONITOR_CALLBACK2(_callbacks->getMonitors(), beforeUninvoking, invoke, invokeId); _callbacks->uninvoke(invokeId); - USCXML_MONITOR_CALLBACK2(_callbacks->getMonitor(), afterUninvoking, invoke, invokeId); + USCXML_MONITOR_CALLBACK2(_callbacks->getMonitors(), afterUninvoking, invoke, invokeId); invoke->setUserData(X("invokeid"), NULL, NULL); free(invokeId); |