Pass more ECMAScript W3C tests

1 files changed, 11 insertions, 3 deletions

diff --git a/src/uscxml/Interpreter.cpp b/src/uscxml/Interpreter.cpp
index 065b61e..b23ccd7 100644
--- a/src/uscxml/Interpreter.cpp
+++ b/src/uscxml/Interpreter.cpp
@@ -914,6 +914,8 @@ void InterpreterImpl::delayedSend(void* userdata, std::string eventName) {
 	if (ioProc) {
 		try {
 			ioProc.send(sendReq);
+		} catch(Event e) {
+			throw e;
 		} catch(...) {
 			LOG(ERROR) << "Exception caught while sending event to ioprocessor " << sendReq.type;
 		}
@@ -1157,7 +1159,10 @@ void InterpreterImpl::executeContent(const NodeList<std::string>& content, bool
 	for (unsigned int i = 0; i < content.getLength(); i++) {
 		if (content.item(i).getNodeType() != Node_base::ELEMENT_NODE)
 			continue;
-		executeContent(content.item(i), rethrow);
+		try {
+			executeContent(content.item(i), true);
+		}
+		CATCH_AND_DISTRIBUTE("Error when executing content");
 	}
 }
 
@@ -1165,7 +1170,10 @@ void InterpreterImpl::executeContent(const NodeSet<std::string>& content, bool r
 	for (unsigned int i = 0; i < content.size(); i++) {
 		if (content[i].getNodeType() != Node_base::ELEMENT_NODE)
 			continue;
-		executeContent(content[i], rethrow);
+		try {
+			executeContent(content[i], true);
+		}
+		CATCH_AND_DISTRIBUTE("Error when executing content");
 	}
 }
 
@@ -1246,7 +1254,7 @@ void InterpreterImpl::executeContent(const Arabica::DOM::Node<std::string>& cont
 						_dataModel.setForeach(item, array, index, iteration);
 						if (content.hasChildNodes())
 							// execute content and have exception rethrown to break foreach
-							executeContent(content.getChildNodes(), true);
+							executeContent(content.getChildNodes(), rethrow);
 					}
 					_dataModel.popContext(); // leave stacked context
 				}