diff options
author | Stefan Radomski <github@mintwerk.de> | 2016-05-26 10:36:49 (GMT) |
---|---|---|
committer | Stefan Radomski <github@mintwerk.de> | 2016-05-26 10:36:49 (GMT) |
commit | 6e13c7b6e0888323223afd5d2e36e86243df57af (patch) | |
tree | f558fd45fa499c8bc95041554ecad6be1bf788c1 /src/uscxml/interpreter/FastMicroStep.cpp | |
parent | f6714b1484b641ea61053350b7d156d2da760b8b (diff) | |
download | uscxml-6e13c7b6e0888323223afd5d2e36e86243df57af.zip uscxml-6e13c7b6e0888323223afd5d2e36e86243df57af.tar.gz uscxml-6e13c7b6e0888323223afd5d2e36e86243df57af.tar.bz2 |
Minor polishing for Java bindings and first draft of JEXL datamodel
Diffstat (limited to 'src/uscxml/interpreter/FastMicroStep.cpp')
-rw-r--r-- | src/uscxml/interpreter/FastMicroStep.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/uscxml/interpreter/FastMicroStep.cpp b/src/uscxml/interpreter/FastMicroStep.cpp index bf58f7b..3ad5515 100644 --- a/src/uscxml/interpreter/FastMicroStep.cpp +++ b/src/uscxml/interpreter/FastMicroStep.cpp @@ -290,23 +290,23 @@ void FastMicroStep::init(XERCESC_NS::DOMElement* scxml) { if (parent && parent->getNodeType() == DOMNode::ELEMENT_NODE) { State* uscxmlState = (State*)parent->getUserData(X("uscxmlState")); // parent maybe a content element - if (uscxmlState != NULL) { - _states[i]->parent = uscxmlState->documentOrder; - } + if (uscxmlState != NULL) { + _states[i]->parent = uscxmlState->documentOrder; + } } while(parent && parent->getNodeType() == DOMNode::ELEMENT_NODE) { State* uscxmlState = (State*)parent->getUserData(X("uscxmlState")); - if (uscxmlState == NULL) - break; + if (uscxmlState == NULL) + break; - // ancestors - BIT_SET_AT(uscxmlState->documentOrder, _states[i]->ancestors); + // ancestors + BIT_SET_AT(uscxmlState->documentOrder, _states[i]->ancestors); - // children - BIT_SET_AT(i, uscxmlState->children); - parent = parent->getParentNode(); + // children + BIT_SET_AT(i, uscxmlState->children); + parent = parent->getParentNode(); } } @@ -403,7 +403,7 @@ void FastMicroStep::markAsCancelled() { _isCancelled = true; } -InterpreterState FastMicroStep::step(bool blocking) { +InterpreterState FastMicroStep::step(size_t blockMs) { if (!_isInitialized) { init(_scxml); return USCXML_INITIALIZED; @@ -517,7 +517,7 @@ InterpreterState FastMicroStep::step(bool blocking) { _flags |= USCXML_CTX_STABLE; } - if ((_event = _callbacks->dequeueExternal(blocking))) { + if ((_event = _callbacks->dequeueExternal(blockMs))) { USCXML_MONITOR_CALLBACK1(_callbacks->getMonitor(), beforeProcessingEvent, _event); goto SELECT_TRANSITIONS; } |