1 files changed, 37 insertions, 180 deletions

diff --git a/src/uscxml/plugins/DataModel.h b/src/uscxml/plugins/DataModel.h
index b08f934..03e557c 100644
--- a/src/uscxml/plugins/DataModel.h
+++ b/src/uscxml/plugins/DataModel.h
@@ -21,208 +21,65 @@
 #define DATAMODEL_H_F1F776F9
 
 #include "uscxml/Common.h"
-#include "uscxml/plugins/Invoker.h"
-#include "uscxml/plugins/IOProcessor.h"
-
-#ifndef TIME_BLOCK
-#	ifdef BUILD_PROFILING
-#		include "uscxml/concurrency/Timer.h"
-#		define TIME_BLOCK Measurement msm(&timer);
-#	else
-#		define TIME_BLOCK
-#	endif
-#endif
+#include "uscxml/messages/Event.h"
 
 #include <list>
 #include <string>
 #include <memory>
-#include <sstream>
-
-#include <xercesc/dom/DOM.hpp>
 
 namespace uscxml {
 
-class InterpreterImpl;
 class DataModelImpl;
+class DataModelExtension;
 
-class USCXML_API DataModelCallbacks {
+/**
+ * @ingroup datamodel
+ * @ingroup facade
+ * The facade for data-models.
+ */
+class USCXML_API DataModel {
 public:
-	virtual const std::string& getName() = 0;
-	virtual const std::string& getSessionId() = 0;
-	virtual const std::map<std::string, IOProcessor>& getIOProcessors() = 0;
-	virtual bool isInState(const std::string& stateId) = 0;
-	virtual xercesc::DOMDocument* getDocument() const = 0;
-	virtual const std::map<std::string, Invoker>& getInvokers() = 0;
-};
 
-class USCXML_API DataModelExtension {
-public:
-	DataModelExtension() : dm(NULL) {}
-	virtual ~DataModelExtension() {}
-	virtual std::string provides() = 0;
-	virtual Data getValueOf(const std::string& member) = 0;
-	virtual void setValueOf(const std::string& member, const Data& data) = 0;
-	DataModelImpl* dm;
-};
+	PIMPL_OPERATORS(DataModel);
 
-class USCXML_API DataModelImpl {
-public:
-	virtual ~DataModelImpl() {}
-	virtual std::shared_ptr<DataModelImpl> create(DataModelCallbacks* interpreter) = 0;
-	virtual std::list<std::string> getNames() = 0;
+	/// @copydoc DataModelImpl::getNames()
+	virtual std::list<std::string> getNames();	
+	/// @copydoc DataModelImpl::isValidSyntax()
+	virtual bool isValidSyntax(const std::string& expr);
 
-	virtual bool isValidSyntax(const std::string& expr) {
-		return true; // overwrite when datamodel supports it
-	}
-	virtual void setEvent(const Event& event) = 0;
+	/// @copydoc DataModelImpl::setEvent()
+	virtual void setEvent(const Event& event);
 
-	size_t replaceExpressions(std::string& content);
+	/// @copydoc DataModelImpl::getAsData()
+	virtual Data getAsData(const std::string& content);
+	/// @copydoc DataModelImpl::evalAsData()
+	virtual Data evalAsData(const std::string& content);
+	/// @copydoc DataModelImpl::evalAsBool()
+	virtual bool evalAsBool(const std::string& expr);
 
-	// foreach
-	virtual uint32_t getLength(const std::string& expr) = 0;
+	/// @copydoc DataModelImpl::getLength()
+	virtual uint32_t getLength(const std::string& expr);
+	/// @copydoc DataModelImpl::setForeach()
 	virtual void setForeach(const std::string& item,
 	                        const std::string& array,
 	                        const std::string& index,
-	                        uint32_t iteration) = 0;
-
-	virtual Data getAsData(const std::string& content) = 0;
-	virtual Data evalAsData(const std::string& content) = 0;
-	virtual bool evalAsBool(const std::string& expr) = 0;
-
-	virtual bool isDeclared(const std::string& expr) = 0;
-
-	/**
-	 * test147:
-	 *     <data id="Var1" expr="0"/>
-	 *
-	 * test150:
-	 *  <data id="Var3">
-	 *    [1,2,3]
-	 *  </data>
-	 *
-	 * test277:
-	 *  <data id="Var1" expr="return"/>
-	 *
-	 */
-	virtual void assign(const std::string& location, const Data& data) = 0;
-	virtual void init(const std::string& location, const Data& data) = 0;
-
-	virtual void setCallbacks(DataModelCallbacks* callbacks) {
-		_callbacks = callbacks;
-	}
+	                        uint32_t iteration);
 
-	virtual void addExtension(DataModelExtension* ext);
-	virtual std::string andExpressions(std::list<std::string>) {
-		return "";
-	}
+	/// @copydoc DataModelImpl::assign()
+	virtual void assign(const std::string& location, const Data& data);
+	/// @copydoc DataModelImpl::init()
+	virtual void init(const std::string& location, const Data& data);
 
-protected:
-	DataModelCallbacks* _callbacks;
-};
+	/// @copydoc DataModelImpl::isDeclared()
+	virtual bool isDeclared(const std::string& expr);
 
-class USCXML_API DataModel {
-public:
+	/// @copydoc DataModelImpl::replaceExpressions()
+	size_t replaceExpressions(std::string& content);
+	/// @copydoc DataModelImpl::andExpressions()
+	std::string andExpressions(std::list<std::string> expressions);
 
-	DataModel() : _impl() {}
-	DataModel(const std::shared_ptr<DataModelImpl> impl) : _impl(impl) { }
-	DataModel(const DataModel& other) : _impl(other._impl) { }
-	virtual ~DataModel() {};
-
-	operator bool()                         const     {
-		return !!_impl;
-	}
-	bool operator< (const DataModel& other) const     {
-		return _impl < other._impl;
-	}
-	bool operator==(const DataModel& other) const     {
-		return _impl == other._impl;
-	}
-	bool operator!=(const DataModel& other) const     {
-		return _impl != other._impl;
-	}
-	DataModel& operator= (const DataModel& other)     {
-		_impl = other._impl;
-		return *this;
-	}
-
-	virtual std::list<std::string> getNames() {
-		TIME_BLOCK
-		return _impl->getNames();
-	}
-
-	virtual bool isValidSyntax(const std::string& expr) {
-		TIME_BLOCK
-		return _impl->isValidSyntax(expr);
-	}
-
-	virtual void setEvent(const Event& event) {
-		TIME_BLOCK
-		return _impl->setEvent(event);
-	}
-	virtual Data getAsData(const std::string& content) {
-		TIME_BLOCK
-		return _impl->getAsData(content);
-	}
-	virtual Data evalAsData(const std::string& content) {
-		TIME_BLOCK
-		return _impl->evalAsData(content);
-	}
-
-	virtual bool evalAsBool(const std::string& expr) {
-		TIME_BLOCK
-		return _impl->evalAsBool(expr);
-	}
-
-	virtual uint32_t getLength(const std::string& expr) {
-		TIME_BLOCK
-		return _impl->getLength(expr);
-	}
-	virtual void setForeach(const std::string& item,
-	                        const std::string& array,
-	                        const std::string& index,
-	                        uint32_t iteration) {
-		TIME_BLOCK
-		return _impl->setForeach(item, array, index, iteration);
-	}
-
-	virtual void assign(const std::string& location, const Data& data) {
-		TIME_BLOCK
-		return _impl->assign(location, data);
-	}
-
-	virtual void init(const std::string& location, const Data& data) {
-		TIME_BLOCK
-		return _impl->init(location, data);
-	}
-
-	virtual bool isDeclared(const std::string& expr) {
-		TIME_BLOCK
-		return _impl->isDeclared(expr);
-	}
-
-	size_t replaceExpressions(std::string& content) {
-		TIME_BLOCK
-		return _impl->replaceExpressions(content);
-	}
-
-	std::string andExpressions(std::list<std::string> expressions) {
-		TIME_BLOCK
-		return _impl->andExpressions(expressions);
-	}
-
-	virtual void setCallbacks(DataModelCallbacks* callbacks) {
-		TIME_BLOCK
-		_impl->setCallbacks(callbacks);
-	}
-
-	virtual void addExtension(DataModelExtension* ext) {
-		TIME_BLOCK
-		_impl->addExtension(ext);
-	}
-
-#ifdef BUILD_PROFILING
-	Timer timer;
-#endif
+	/// @copydoc DataModelImpl::addExtension()
+	virtual void addExtension(DataModelExtension* ext);
 
 protected:
 	std::shared_ptr<DataModelImpl> _impl;