Passes more tests again

3 files changed, 12 insertions, 5 deletions

diff --git a/src/uscxml/Interpreter.cpp b/src/uscxml/Interpreter.cpp
index c29c2ec..9390ca4 100644
--- a/src/uscxml/Interpreter.cpp
+++ b/src/uscxml/Interpreter.cpp
@@ -258,7 +258,7 @@ std::list<InterpreterIssue> Interpreter::validate() {
 static void printNodeSet(Logger& logger, const std::list<XERCESC_NS::DOMElement*> nodes) {
 	std::string seperator;
 	for (auto nIter = nodes.begin(); nIter != nodes.end(); nIter++) {
-		LOG(logger, USCXML_VERBATIM) << seperator << (HAS_ATTR(*nIter, kXMLCharId) ? ATTR(*nIter, kXMLCharId) : DOMUtils::xPathForNode(*nIter)) << std::endl;
+        LOG(logger, USCXML_VERBATIM) << seperator << (HAS_ATTR(*nIter, kXMLCharId) ? ATTR(*nIter, kXMLCharId) : DOMUtils::xPathForNode(*nIter));
 		seperator = ", ";
 	}
 }
diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp
index 4443237..f3f5376 100644
--- a/src/uscxml/interpreter/BasicContentExecutor.cpp
+++ b/src/uscxml/interpreter/BasicContentExecutor.cpp
@@ -512,7 +512,7 @@ void BasicContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC
 			try {
 				// namelist
 				processNameLists(doneEvent.namelist, doneData);
-			} catch (Event e) {
+			} catch (ErrorEvent e) {
 				ERROR_EXECUTION_RETHROW(e, "Syntax error in donedata element namelist", doneData);
 			}
 
@@ -520,7 +520,7 @@ void BasicContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC
 			try {
 				// params
 				processParams(doneEvent.params, doneData);
-			} catch (Event e) {
+			} catch (ErrorEvent e) {
 				ERROR_EXECUTION_RETHROW(e, "Syntax error in donedata element param expr", doneData);
 			}
 
@@ -530,7 +530,7 @@ void BasicContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC
 				if (contents.size() > 0) {
 					doneEvent.data = elementAsData(contents.front());
 				}
-			} catch (Event e) {
+			} catch (ErrorEvent e) {
 				ERROR_EXECUTION_RETHROW(e, "Syntax error in donedata element content", doneData);
 			}
 
@@ -542,7 +542,10 @@ void BasicContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC
 			_callbacks->enqueueInternal(e);
 			//        std::cout << exc << std::endl;
 			//        throw e;
-		}
+        } catch (Event e) {
+            ERROR_EXECUTION_RETHROW(e, "Error in donedata element", doneData);
+        }
+        
 	}
 
 	_callbacks->enqueueInternal(doneEvent);
diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp
index 048deb5..a764c82 100644
--- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp
@@ -409,6 +409,10 @@ void PromelaDataModel::setEvent(const Event& event) {
 		case PML_NAME: {
 			Data d = getVariable(node);
 			if (d.atom.size() != 0)
+                // fixes issue 127
+                if (isNumeric(d.atom.c_str(), 10)) {
+                    return Data(d.atom, Data::VERBATIM);
+                }
 				return Data(d.asJSON(), Data::VERBATIM);
 			if (d.type == Data::INTERPRETED && d.atom[0] == '\'' && d.atom[d.atom.size() - 1] == '\'')
 				return Data(d.atom.substr(1, d.atom.size() - 2), Data::VERBATIM);