diff options
author | Stefan Radomski <sradomski@mintwerk.de> | 2016-01-10 02:40:12 (GMT) |
---|---|---|
committer | Stefan Radomski <sradomski@mintwerk.de> | 2016-01-10 02:40:12 (GMT) |
commit | 613cf9fb6fe4b24bc7852d5a31953f6ff419e43c (patch) | |
tree | 8459365c5a6a00503063b0bf1d516fce5ea4d891 /src/uscxml/interpreter | |
parent | c699a4057a65a9a09f78310d8e12588f2dc072cd (diff) | |
download | uscxml-613cf9fb6fe4b24bc7852d5a31953f6ff419e43c.zip uscxml-613cf9fb6fe4b24bc7852d5a31953f6ff419e43c.tar.gz uscxml-613cf9fb6fe4b24bc7852d5a31953f6ff419e43c.tar.bz2 |
Beautified code
Diffstat (limited to 'src/uscxml/interpreter')
-rw-r--r-- | src/uscxml/interpreter/InterpreterDraft6.cpp | 14 | ||||
-rw-r--r-- | src/uscxml/interpreter/InterpreterRC.cpp | 40 |
2 files changed, 27 insertions, 27 deletions
diff --git a/src/uscxml/interpreter/InterpreterDraft6.cpp b/src/uscxml/interpreter/InterpreterDraft6.cpp index 48ba78f..f79049d 100644 --- a/src/uscxml/interpreter/InterpreterDraft6.cpp +++ b/src/uscxml/interpreter/InterpreterDraft6.cpp @@ -441,13 +441,13 @@ void InterpreterDraft6::enterStates(const Arabica::XPath::NodeSet<std::string>& } #endif if (isFinal(stateElem)) { - - Arabica::DOM::Element<std::string> doneData; - Arabica::XPath::NodeSet<std::string> doneDatas = filterChildElements(_nsInfo.xmlNSPrefix + "donedata", stateElem); - if (doneDatas.size() > 0) { - // only process first donedata element - doneData = Element<std::string>(doneDatas[0]); - } + + Arabica::DOM::Element<std::string> doneData; + Arabica::XPath::NodeSet<std::string> doneDatas = filterChildElements(_nsInfo.xmlNSPrefix + "donedata", stateElem); + if (doneDatas.size() > 0) { + // only process first donedata element + doneData = Element<std::string>(doneDatas[0]); + } internalDoneSend(stateElem, doneData); Node<std::string> parent = stateElem.getParentNode(); diff --git a/src/uscxml/interpreter/InterpreterRC.cpp b/src/uscxml/interpreter/InterpreterRC.cpp index 879c771..e1f4ada 100644 --- a/src/uscxml/interpreter/InterpreterRC.cpp +++ b/src/uscxml/interpreter/InterpreterRC.cpp @@ -181,7 +181,7 @@ function computeExitSet(transitions) return statesToExit */ Arabica::XPath::NodeSet<std::string> InterpreterRC::computeExitSet(const Arabica::XPath::NodeSet<std::string>& transitions) { - + NodeSet<std::string> statesToExit; for (unsigned int i = 0; i < transitions.size(); i++) { Element<std::string> t(transitions[i]); @@ -204,7 +204,7 @@ Arabica::XPath::NodeSet<std::string> InterpreterRC::computeExitSet(const Arabica } std::cout << std::endl; #endif - + return statesToExit; } @@ -214,16 +214,16 @@ Arabica::XPath::NodeSet<std::string> InterpreterRC::computeExitSet(const Arabica Arabica::XPath::NodeSet<std::string> transitions; transitions.push_back(transition); - + Arabica::XPath::NodeSet<std::string> exitSet = computeExitSet(transitions); //_exitSet[transition] = exitSet; - + #if 0 - std::cerr << "Exit set for transition '" << transition << "': " << std::endl; - for (int i = 0; i < exitSet.size(); i++) { - std::cerr << ATTR_CAST(exitSet[i], "id") << std::endl << "----" << std::endl; - } - std::cerr << std::endl; + std::cerr << "Exit set for transition '" << transition << "': " << std::endl; + for (int i = 0; i < exitSet.size(); i++) { + std::cerr << ATTR_CAST(exitSet[i], "id") << std::endl << "----" << std::endl; + } + std::cerr << std::endl; #endif return exitSet; } @@ -302,19 +302,19 @@ void InterpreterRC::enterStates(const Arabica::XPath::NodeSet<std::string>& enab } if (isFinal(s)) { - Element<std::string> parent = (Element<std::string>)s.getParentNode(); + Element<std::string> parent = (Element<std::string>)s.getParentNode(); - Arabica::DOM::Element<std::string> doneData; - Arabica::XPath::NodeSet<std::string> doneDatas = filterChildElements(_nsInfo.xmlNSPrefix + "donedata", s); - if (doneDatas.size() > 0) { - // only process first donedata element - doneData = Element<std::string>(doneDatas[0]); - } + Arabica::DOM::Element<std::string> doneData; + Arabica::XPath::NodeSet<std::string> doneDatas = filterChildElements(_nsInfo.xmlNSPrefix + "donedata", s); + if (doneDatas.size() > 0) { + // only process first donedata element + doneData = Element<std::string>(doneDatas[0]); + } - if (parentIsScxmlState(s)) { + if (parentIsScxmlState(s)) { _topLevelFinalReached = true; } else { - internalDoneSend(parent, doneData); + internalDoneSend(parent, doneData); Element<std::string> grandParent = (Element<std::string>)parent.getParentNode(); // internalDoneSend(parent, Arabica::DOM::Element<std::string>()); @@ -648,7 +648,7 @@ BREAK_LOOP: void InterpreterRC::handleDOMEvent(Arabica::DOM::Events::Event<std::string>& event) { InterpreterImpl::handleDOMEvent(event); - + if (event.getType().compare("DOMAttrModified") == 0) // we do not care about attributes return; @@ -656,6 +656,6 @@ void InterpreterRC::handleDOMEvent(Arabica::DOM::Events::Event<std::string>& eve // NodeSet<std::string> transitions = InterpreterImpl::filterChildElements(_nsInfo.xmlNSPrefix + "transition", target, true); // if (transitions.size() > 0) _exitSet.clear(); - + } }
\ No newline at end of file |