Fixed issue86 and some more bug fixes

15 files changed, 94 insertions, 21 deletions

diff --git a/src/uscxml/debug/InterpreterIssue.cpp b/src/uscxml/debug/InterpreterIssue.cpp
index 49d31c8..df2d125 100644
--- a/src/uscxml/debug/InterpreterIssue.cpp
+++ b/src/uscxml/debug/InterpreterIssue.cpp
@@ -384,7 +384,7 @@ std::list<InterpreterIssue> InterpreterIssue::forInterpreter(InterpreterImpl* in
 		}
 
 		// check whether state is reachable
-		if (!DOMUtils::isMember(state, reachable) && !isInEmbeddedDocument(state)) {
+		if (!DOMUtils::isMember(state, reachable) && areFromSameMachine(state, interpreter->_scxml)) {
 			issues.push_back(InterpreterIssue("State with id '" + stateId + "' is unreachable", state, InterpreterIssue::USCXML_ISSUE_FATAL));
 		}
 
diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp
index 366c4bd..58d3eae 100644
--- a/src/uscxml/interpreter/BasicContentExecutor.cpp
+++ b/src/uscxml/interpreter/BasicContentExecutor.cpp
@@ -404,7 +404,7 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) {
 			}
 		}
         
-		// we need the invokeid to uninvoke - TODO: This is leaking!
+		// we need the invokeid to uninvoke
 		char* invokeId = (char*)malloc(invokeEvent.invokeid.size() + 1);
 		memcpy(invokeId, invokeEvent.invokeid.c_str(), invokeEvent.invokeid.size());
 		invokeId[invokeEvent.invokeid.size()] = 0;
@@ -469,7 +469,6 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) {
 }
 
 void BasicContentExecutor::uninvoke(XERCESC_NS::DOMElement* invoke) {
-	// TODO: DANGER This is the real danger here
 	char* invokeId = (char*)invoke->getUserData(X("invokeid"));
 	assert(invokeId != NULL);
 
@@ -557,13 +556,16 @@ void BasicContentExecutor::processParams(std::multimap<std::string, Data>& param
 Data BasicContentExecutor::elementAsData(XERCESC_NS::DOMElement* element) {
 	if (HAS_ATTR(element, "expr")) {
 //        return _callbacks->evalAsData(ATTR(element, "expr"));
-		if (LOCALNAME(element) == "content") {
+#if 0
+        if (LOCALNAME(element) == "content") {
 			// test 528
 			return _callbacks->evalAsData(ATTR(element, "expr"));
 		} else {
 			// test 326
 			return Data(ATTR(element, "expr"), Data::INTERPRETED);
 		}
+#endif
+        return _callbacks->evalAsData(ATTR(element, "expr"));
 	}
 
 	if (HAS_ATTR(element, "src")) {
diff --git a/src/uscxml/interpreter/BasicEventQueue.cpp b/src/uscxml/interpreter/BasicEventQueue.cpp
index d484ada..7505f46 100644
--- a/src/uscxml/interpreter/BasicEventQueue.cpp
+++ b/src/uscxml/interpreter/BasicEventQueue.cpp
@@ -74,6 +74,11 @@ void BasicEventQueue::enqueue(const Event& event) {
 	_cond.notify_all();
 }
 
+void BasicEventQueue::reset() {
+    std::lock_guard<std::recursive_mutex> lock(_mutex);
+    _queue.clear();
+}
+
 static void dummyCallback(evutil_socket_t fd, short what, void *arg) {
 	timeval tv;
 	tv.tv_sec = 365 * 24 * 3600;
@@ -206,4 +211,10 @@ void BasicDelayedEventQueue::stop() {
 	}
 }
 
+void BasicDelayedEventQueue::reset() {
+    std::lock_guard<std::recursive_mutex> lock(_mutex);
+    cancelAllDelayed();
+    _queue.clear();
+}
+
 }
\ No newline at end of file
diff --git a/src/uscxml/interpreter/BasicEventQueue.h b/src/uscxml/interpreter/BasicEventQueue.h
index a6374d8..1542e30 100644
--- a/src/uscxml/interpreter/BasicEventQueue.h
+++ b/src/uscxml/interpreter/BasicEventQueue.h
@@ -43,7 +43,8 @@ public:
 	virtual ~BasicEventQueue();
 	virtual Event dequeue(size_t blockMs);
 	virtual void enqueue(const Event& event);
-
+    virtual void reset();
+    
 protected:
 	std::list<Event> _queue;
 	std::recursive_mutex _mutex;
@@ -67,6 +68,7 @@ public:
 	virtual void enqueue(const Event& event) {
 		return BasicEventQueue::enqueue(event);
 	}
+    virtual void reset();
 
 protected:
 	struct callbackData {
diff --git a/src/uscxml/interpreter/EventQueue.cpp b/src/uscxml/interpreter/EventQueue.cpp
index c460e02..7ff0bfb 100644
--- a/src/uscxml/interpreter/EventQueue.cpp
+++ b/src/uscxml/interpreter/EventQueue.cpp
@@ -38,6 +38,9 @@ Event EventQueue::dequeue(size_t blockMs) {
 void EventQueue::enqueue(const Event& event) {
 	return _impl->enqueue(event);
 }
+void EventQueue::reset() {
+    return _impl->reset();
+}
 
 PIMPL_OPERATORS_INHERIT_IMPL(DelayedEventQueue, EventQueue)
 
diff --git a/src/uscxml/interpreter/EventQueue.h b/src/uscxml/interpreter/EventQueue.h
index 1e8b018..37b90be 100644
--- a/src/uscxml/interpreter/EventQueue.h
+++ b/src/uscxml/interpreter/EventQueue.h
@@ -38,6 +38,7 @@ public:
 
 	virtual Event dequeue(size_t blockMs);
 	virtual void enqueue(const Event& event);
+    virtual void reset();
 
 protected:
 	std::shared_ptr<EventQueueImpl> _impl;
diff --git a/src/uscxml/interpreter/EventQueueImpl.h b/src/uscxml/interpreter/EventQueueImpl.h
index 1ccd3f1..befd684 100644
--- a/src/uscxml/interpreter/EventQueueImpl.h
+++ b/src/uscxml/interpreter/EventQueueImpl.h
@@ -42,6 +42,7 @@ class USCXML_API EventQueueImpl {
 public:
 	virtual Event dequeue(size_t blockMs) = 0;
 	virtual void enqueue(const Event& event) = 0;
+    virtual void reset() = 0;
 };
 
 /**
diff --git a/src/uscxml/interpreter/FastMicroStep.cpp b/src/uscxml/interpreter/FastMicroStep.cpp
index 927fbbc..ea43c5d 100644
--- a/src/uscxml/interpreter/FastMicroStep.cpp
+++ b/src/uscxml/interpreter/FastMicroStep.cpp
@@ -234,8 +234,8 @@ void FastMicroStep::init(XERCESC_NS::DOMElement* scxml) {
 		std::list<DOMElement*> dataModels = DOMUtils::filterChildElements(_xmlPrefix.str() + "datamodel", _states[0]->element, true);
 		dataModels.erase(std::remove_if(dataModels.begin(),
 		                                dataModels.end(),
-		[](DOMElement* elem) {
-			return isInEmbeddedDocument(elem);
+		[this](DOMElement* elem) {
+			return !areFromSameMachine(elem, _scxml);
 		}),
 		dataModels.end());
 
diff --git a/src/uscxml/interpreter/InterpreterImpl.h b/src/uscxml/interpreter/InterpreterImpl.h
index e693bbf..be33306 100644
--- a/src/uscxml/interpreter/InterpreterImpl.h
+++ b/src/uscxml/interpreter/InterpreterImpl.h
@@ -76,11 +76,14 @@ public:
 	}
 
 	virtual void reset() {///< Reset state machine
-		_microStepper.reset();
+		if (_microStepper)
+            _microStepper.reset();
+        
 		_isInitialized = false;
 		_state = USCXML_INSTANTIATED;
 //        _dataModel.reset();
-//        _eventQueue.reset();
+        if (_delayQueue)
+            _delayQueue.reset();
 //        _contentExecutor.reset();
 	}
 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
index 35d9c4b..05d37d4 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
@@ -28,6 +28,8 @@
 #include "uscxml/util/DOM.h"
 #include <easylogging++.h>
 
+#include <boost/algorithm/string.hpp>
+
 #define EVENT_STRING_OR_UNDEF(field, cond) \
 JSStringRef field##Name = JSStringCreateWithUTF8CString( #field ); \
 JSStringRef field##Val = JSStringCreateWithUTF8CString(event.field.c_str()); \
@@ -399,7 +401,23 @@ Data JSCDataModel::evalAsData(const std::string& content) {
 
 Data JSCDataModel::getAsData(const std::string& content) {
 	// parse as JSON test 578
-	return Data::fromJSON(content);
+  Data d = Data::fromJSON(content);
+  if (!d.empty())
+      return d;
+  
+  std::string trimmed = boost::trim_copy(content);
+  if (trimmed.length() > 0) {
+      if (isNumeric(trimmed.c_str(), 10)) {
+          d = Data(trimmed, Data::INTERPRETED);
+      } else if (trimmed.length() >= 2 &&
+                 ((trimmed[0] == '"' && trimmed[trimmed.length() - 1] == '"') ||
+                  (trimmed[0] == '\'' && trimmed[trimmed.length() - 1] == '\''))) {
+          d = Data(trimmed.substr(1, trimmed.length() - 2), Data::VERBATIM);
+      } else {
+          d = Data(trimmed, Data::INTERPRETED);
+      }
+  }
+  return d;
 }
 
 JSValueRef JSCDataModel::getDataAsValue(const Data& data) {
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
index 1db4f45..db65ebf 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
@@ -33,6 +33,8 @@
 #include "uscxml/util/DOM.h"
 #include <easylogging++.h>
 
+#include <boost/algorithm/string.hpp>
+
 using namespace XERCESC_NS;
 
 static v8::Local<v8::Value> XMLString2JS(const XMLCh* input) {
@@ -421,7 +423,23 @@ void V8DataModel::setEvent(const Event& event) {
 }
 
 Data V8DataModel::getAsData(const std::string& content) {
-	return Data::fromJSON(content);
+    Data d = Data::fromJSON(content);
+    if (!d.empty())
+        return d;
+    
+    std::string trimmed = boost::trim_copy(content);
+    if (trimmed.length() > 0) {
+        if (isNumeric(trimmed.c_str(), 10)) {
+            d = Data(trimmed, Data::INTERPRETED);
+        } else if (trimmed.length() >= 2 &&
+                   ((trimmed[0] == '"' && trimmed[trimmed.length() - 1] == '"') ||
+                    (trimmed[0] == '\'' && trimmed[trimmed.length() - 1] == '\''))) {
+            d = Data(trimmed.substr(1, trimmed.length() - 2), Data::VERBATIM);
+        } else {
+            d = Data(trimmed, Data::INTERPRETED);
+        }
+    }
+    return d;
 }
 
 Data V8DataModel::evalAsData(const std::string& content) {
diff --git a/src/uscxml/transform/ChartToC.cpp b/src/uscxml/transform/ChartToC.cpp
index b76d4da..84f325e 100644
--- a/src/uscxml/transform/ChartToC.cpp
+++ b/src/uscxml/transform/ChartToC.cpp
@@ -1726,7 +1726,7 @@ void ChartToC::writeElementInfo(std::ostream& stream) {
 			std::stringstream ss;
 			DOMNodeList* cChilds = contents.front()->getChildNodes();
 			for (size_t j = 0; j < cChilds->getLength(); j++) {
-				ss << cChilds->item(j);
+				ss << *(cChilds->item(j));
 			}
 			stream << (ss.str().size() > 0 ? "\"" + escape(ss.str()) + "\", " : "NULL, ");
 			stream << (HAS_ATTR_CAST(contents.front(), "expr") ? "\"" + ATTR_CAST(contents.front(), "expr") + "\", " : "NULL, ");
diff --git a/src/uscxml/util/DOM.h b/src/uscxml/util/DOM.h
index 3ab27a3..0b35f40 100644
--- a/src/uscxml/util/DOM.h
+++ b/src/uscxml/util/DOM.h
@@ -118,6 +118,11 @@ protected:
 #define XML_PREFIX(element) X(element->getPrefix() ? X(element->getPrefix()).str() + ":" : "")
 
 #if 1
+/**
+ * @todo: More performant XercesStrings
+ * https://alfps.wordpress.com/2010/05/27/cppx-xerces-strings-simplified-by-ownership-part-i/
+ */
+
 class USCXML_API X {
 public :
 
diff --git a/src/uscxml/util/Predicates.cpp b/src/uscxml/util/Predicates.cpp
index cd41089..006e8dc 100644
--- a/src/uscxml/util/Predicates.cpp
+++ b/src/uscxml/util/Predicates.cpp
@@ -460,16 +460,25 @@ std::list<DOMElement*> getReachableStates(const DOMElement* root) {
 }
 
 
-bool isInEmbeddedDocument(const DOMNode* node) {
-	// a node is in an embedded document if there is a content element in its parents
-	const DOMNode* parent = node;
-	while(parent) {
-		if(iequals(LOCALNAME(parent), "content")) {
-			return true;
+bool areFromSameMachine(const DOMNode* n1, const DOMNode* n2) {
+    // we traverse each nodes parent's until we reach an scxml element or null
+	const DOMNode* p1 = n1;
+	while(p1) {
+		if(iequals(LOCALNAME(p1), "scxml")) {
+            break;
 		}
-		parent = parent->getParentNode();
+		p1 = p1->getParentNode();
 	}
-	return false;
+
+    const DOMNode* p2 = n2;
+    while(p2) {
+        if(iequals(LOCALNAME(p2), "scxml")) {
+            break;
+        }
+        p2 = p2->getParentNode();
+    }
+
+    return p1 == p2;
 }
 
 }
\ No newline at end of file
diff --git a/src/uscxml/util/Predicates.h b/src/uscxml/util/Predicates.h
index 7bc4a9c..6204d6a 100644
--- a/src/uscxml/util/Predicates.h
+++ b/src/uscxml/util/Predicates.h
@@ -39,7 +39,7 @@ std::list<XERCESC_NS::DOMElement*> getTargetStates(const XERCESC_NS::DOMElement*
 std::list<XERCESC_NS::DOMElement*> getEffectiveTargetStates(const XERCESC_NS::DOMElement* transition);
 XERCESC_NS::DOMElement* getTransitionDomain(const XERCESC_NS::DOMElement* transition, const XERCESC_NS::DOMElement* root);
 
-bool isInEmbeddedDocument(const XERCESC_NS::DOMNode* node);
+bool areFromSameMachine(const XERCESC_NS::DOMNode* n1, const XERCESC_NS::DOMNode* n2);
 
 std::list<XERCESC_NS::DOMElement*> getStates(const std::list<std::string>& stateIds, const XERCESC_NS::DOMElement* root);
 XERCESC_NS::DOMElement* getState(const std::string& stateId, const XERCESC_NS::DOMElement* root);