Got rid of more dynamic_casts

4 files changed, 31 insertions, 17 deletions

diff --git a/src/uscxml/interpreter/InterpreterDraft6.cpp b/src/uscxml/interpreter/InterpreterDraft6.cpp
index 554cd28..92333f1 100644
--- a/src/uscxml/interpreter/InterpreterDraft6.cpp
+++ b/src/uscxml/interpreter/InterpreterDraft6.cpp
@@ -105,7 +105,7 @@ NodeSet<std::string> InterpreterDraft6::getDocumentInitialTransitions() {
 				Element<std::string> transitionElem = _document.createElementNS(_nsInfo.nsURL, "transition");
 				_nsInfo.setPrefix(transitionElem);
 
-				transitionElem.setAttribute("target", ATTR(initialStates[i], "id"));
+				transitionElem.setAttribute("target", ATTR_CAST(initialStates[i], "id"));
 				initialElem.appendChild(transitionElem);
 				_scxml.appendChild(initialElem);
 				initialTransitions.push_back(transitionElem);
@@ -138,13 +138,6 @@ InterpreterState InterpreterDraft6::step(int waitForMS = 0) {
 			setInterpreterState(USCXML_MICROSTEPPED);
 		}
 
-		if (!isLegalConfiguration(_configuration)) {
-			std:: cout << "Illegal configuration: {";
-			for (int i = 0; i < _configuration.size(); i++) {
-				std::cout << ATTR(_configuration[i], "id") << ", " << std::endl;
-			}
-			std:: cout << "}" << std::endl;
-		}
 		assert(isLegalConfiguration(_configuration));
 
 		// are there spontaneous transitions?
@@ -203,8 +196,9 @@ InterpreterState InterpreterDraft6::step(int waitForMS = 0) {
 		for (unsigned int i = 0; i < _statesToInvoke.size(); i++) {
 			NodeSet<std::string> invokes = filterChildElements(_nsInfo.xmlNSPrefix + "invoke", _statesToInvoke[i]);
 			for (unsigned int j = 0; j < invokes.size(); j++) {
-				if (!HAS_ATTR(invokes[j], "persist") || !DOMUtils::attributeIsTrue(ATTR(invokes[j], "persist"))) {
-					invoke(invokes[j]);
+				Element<std::string> invokeElem = Element<std::string>(invokes[j]);
+				if (!HAS_ATTR(invokeElem, "persist") || !DOMUtils::attributeIsTrue(ATTR(invokeElem, "persist"))) {
+					invoke(invokeElem);
 				}
 			}
 		}
@@ -354,8 +348,9 @@ void InterpreterDraft6::stabilize() {
 	for (unsigned int i = 0; i < _statesToInvoke.size(); i++) {
 		NodeSet<std::string> invokes = filterChildElements(_nsInfo.xmlNSPrefix + "invoke", _statesToInvoke[i]);
 		for (unsigned int j = 0; j < invokes.size(); j++) {
-			if (!HAS_ATTR(invokes[j], "persist") || !DOMUtils::attributeIsTrue(ATTR(invokes[j], "persist"))) {
-				invoke(invokes[j]);
+			Element<std::string> invokeElem = Element<std::string>(invokes[j]);
+			if (!HAS_ATTR(invokeElem, "persist") || !DOMUtils::attributeIsTrue(ATTR(invokeElem, "persist"))) {
+				invoke(invokeElem);
 			}
 		}
 	}
@@ -641,7 +636,7 @@ void InterpreterDraft6::exitInterpreter() {
 		Arabica::XPath::NodeSet<std::string> invokeElems = filterChildElements(_nsInfo.xmlNSPrefix + "invoke", statesToExit[i]);
 		// TODO: we ought to cancel all remaining invokers just to be sure with the persist extension
 		for (int j = 0; j < invokeElems.size(); j++) {
-			cancelInvoke(invokeElems[j]);
+			cancelInvoke(Element<std::string>(invokeElems[j]));
 		}
 		Element<std::string> stateElem(statesToExit[i]);
 		if (isFinal(stateElem) && parentIsScxmlState(stateElem)) {
@@ -902,8 +897,9 @@ void InterpreterDraft6::enterStates(const Arabica::XPath::NodeSet<std::string>&
 		for (unsigned int k = 0; k < statesToEnter.size(); k++) {
 			NodeSet<std::string> invokes = filterChildElements(_nsInfo.xmlNSPrefix + "invoke", statesToEnter[k]);
 			for (unsigned int j = 0; j < invokes.size(); j++) {
-				if (HAS_ATTR(invokes[j], "persist") && DOMUtils::attributeIsTrue(ATTR(invokes[j], "persist"))) {
-					invoke(invokes[j]);
+				Element<std::string> invokeElem = Element<std::string>(invokes[j]);
+				if (HAS_ATTR(invokeElem, "persist") && DOMUtils::attributeIsTrue(ATTR(invokeElem, "persist"))) {
+					invoke(invokeElem);
 				}
 			}
 		}
@@ -1063,5 +1059,20 @@ void InterpreterDraft6::addStatesToEnter(const Element<std::string>& state,
 	}
 }
 
+void InterpreterDraft6::handleDOMEvent(Arabica::DOM::Events::Event<std::string>& event) {
+	InterpreterImpl::handleDOMEvent(event);
+
+	// remove modified states from cache
+	if (event.getType().compare("DOMAttrModified") == 0) // we do not care about attributes
+		return;
+	Node<std::string> target = Arabica::DOM::Node<std::string>(event.getTarget());
+	NodeSet<std::string> transitions = InterpreterImpl::filterChildElements(_nsInfo.xmlNSPrefix + "transition", target);
+	for (int i = 0; i < transitions.size(); i++) {
+		const Element<std::string> transElem = Element<std::string>(transitions[i]);
+		if (_transWithinParallel.find(transElem) != _transWithinParallel.end())
+			_transWithinParallel.erase(transElem);
+	}
+}
+
 
 }
\ No newline at end of file
diff --git a/src/uscxml/interpreter/InterpreterDraft6.h b/src/uscxml/interpreter/InterpreterDraft6.h
index 062d79a..3414e5e 100644
--- a/src/uscxml/interpreter/InterpreterDraft6.h
+++ b/src/uscxml/interpreter/InterpreterDraft6.h
@@ -56,6 +56,9 @@ protected:
 	Arabica::DOM::Node<std::string> findLCPA(const Arabica::XPath::NodeSet<std::string>& states);
 
 	std::map<Arabica::DOM::Element<std::string>, bool> _transWithinParallel; // this is costly to calculate
+
+	virtual void handleDOMEvent(Arabica::DOM::Events::Event<std::string>& event);
+
 };
 
 }
diff --git a/src/uscxml/interpreter/InterpreterRC.cpp b/src/uscxml/interpreter/InterpreterRC.cpp.deactivated
index 24b9003..9993227 100644
--- a/src/uscxml/interpreter/InterpreterRC.cpp
+++ b/src/uscxml/interpreter/InterpreterRC.cpp.deactivated
@@ -161,7 +161,7 @@ InterpreterState InterpreterRC::interpret() {
 					Element<std::string> transitionElem = _document.createElementNS(_nsInfo.nsURL, "transition");
 					_nsInfo.setPrefix(transitionElem);
 
-					transitionElem.setAttribute("target", ATTR(initialStates[i], "id"));
+					transitionElem.setAttribute("target", ATTR_CAST(initialStates[i], "id"));
 					initialElem.appendChild(transitionElem);
 					_scxml.appendChild(initialElem);
 					initialTransitions.push_back(transitionElem);
@@ -286,7 +286,7 @@ void InterpreterRC::mainEventLoop() {
 		if (!hasLegalConfiguration()) {
 			std::cout << "Illegal configuration!" << std::endl;
 			for (unsigned int j = 0; j < _configuration.size(); j++) {
-				std::cout << ATTR(_configuration[j], "id") << " ";
+				std::cout << ATTR_CAST(_configuration[j], "id") << " ";
 			}
 			std::cout << std::endl;
 		}
diff --git a/src/uscxml/interpreter/InterpreterRC.h b/src/uscxml/interpreter/InterpreterRC.h.deactivated
index 9afc2e6..9afc2e6 100644
--- a/src/uscxml/interpreter/InterpreterRC.h
+++ b/src/uscxml/interpreter/InterpreterRC.h.deactivated