Minor polishing for Java bindings and first draft of JEXL datamodel

8 files changed, 41 insertions, 39 deletions

diff --git a/src/uscxml/plugins/DataModel.h b/src/uscxml/plugins/DataModel.h
index 03e557c..7716ad7 100644
--- a/src/uscxml/plugins/DataModel.h
+++ b/src/uscxml/plugins/DataModel.h
@@ -43,7 +43,7 @@ public:
 	PIMPL_OPERATORS(DataModel);
 
 	/// @copydoc DataModelImpl::getNames()
-	virtual std::list<std::string> getNames();	
+	virtual std::list<std::string> getNames();
 	/// @copydoc DataModelImpl::isValidSyntax()
 	virtual bool isValidSyntax(const std::string& expr);
 
diff --git a/src/uscxml/plugins/DataModelImpl.h b/src/uscxml/plugins/DataModelImpl.h
index c3f5390..403a213 100644
--- a/src/uscxml/plugins/DataModelImpl.h
+++ b/src/uscxml/plugins/DataModelImpl.h
@@ -69,11 +69,11 @@ public:
 class USCXML_API DataModelImpl {
 public:
 	virtual ~DataModelImpl() {}
-	
+
 	/**
 	 * The Factory wants to instantiate a new instance.
-	 * This function will have to initialize the object. The actual constructor 
-	 * is called from within here. The only one who calls the constructor directly 
+	 * This function will have to initialize the object. The actual constructor
+	 * is called from within here. The only one who calls the constructor directly
 	 * is the Factory for the prototype object.
 	 *
 	 * @param callbacks The callbacks available to the datamodel
@@ -87,7 +87,7 @@ public:
 	virtual std::list<std::string> getNames() = 0;
 
 	/**
-	 * Determine whether a given string constitutes valid syntax in the 
+	 * Determine whether a given string constitutes valid syntax in the
 	 * data-model's language.
 	 * @param expr A string, supposedly containing an expression of the data-model.
 	 * @return Whether expr is in L(DM).
@@ -95,7 +95,7 @@ public:
 	virtual bool isValidSyntax(const std::string& expr) {
 		return true; // overwrite when datamodel supports it
 	}
-	
+
 	/**
 	 * Set the given event as `_event` in the data-model's global scope.
 	 * @param event The event as it was dequeued from either the internal or external queue.
@@ -104,7 +104,7 @@ public:
 
 	/**
 	 * Experimental extension to have dynamic content in string literals.
-	 * This function was used to replace ${foo} expressions on the data-model, 
+	 * This function was used to replace ${foo} expressions on the data-model,
 	 * e.g. in text nodes. It will eventually make a reappearance I guess.
 	 * @param content The string with tokens to replace.
 	 * @return How many occurences where replaced.
@@ -116,8 +116,8 @@ public:
 	 * @param expr Anything that possibly evaluates to an enumerable object.
 	 * @return The number of items in the enumerable object.
 	 */
-	virtual uint32_t getLength(const std::string& expr) = 0;
-	
+    virtual uint32_t getLength(const std::string& expr) = 0;
+
 	/**
 	 * Set a given item to the object at a given index for one iteration.
 	 * @param item A variable or location to assign the current object to.
@@ -143,7 +143,7 @@ public:
 	 * @return An evaluated structure representing the given compound or literal.
 	 */
 	virtual Data evalAsData(const std::string& content) = 0;
-	
+
 	/**
 	 * Evaluate a given expression as a boolean.
 	 * This function is a subset of evalAsData() but saves on creating and copying a Data object.
@@ -162,28 +162,28 @@ public:
 	/**
 	 * Assign a data object to a location in the data-model.
 	 * There are different occurences in the SCXML IRP tests, e.g.
-\verbatim
-test147:
-  <data id="Var1" expr="0"/>
-
-test150:
-  <data id="Var3">
-    [1,2,3]
-  </data>
-
-test277:
-  <data id="Var1" expr="return"/>
-\endverbatim
+	\verbatim
+	test147:
+	<data id="Var1" expr="0"/>
+
+	test150:
+	<data id="Var3">
+	[1,2,3]
+	</data>
+
+	test277:
+	<data id="Var1" expr="return"/>
+	\endverbatim
 	 * @param location A variable or locatio to assign to.
 	 * @param data The Data object with the respective data.
 	 */
 	virtual void assign(const std::string& location, const Data& data) = 0;
-	
+
 	/**
 	 * Initialize a variable / location in the data-model with a given data object.
-	 * This is, semantically, very close to assign() but does not assume the 
+	 * This is, semantically, very close to assign() but does not assume the
 	 * location to be declared first.
-	 * 
+	 *
 	 * @param location A variable or locatio to assign to.
 	 * @param data The Data object with the respective data.
 	 */
@@ -194,10 +194,10 @@ test277:
 	 * @todo This is currently unsupported
 	 */
 	virtual void addExtension(DataModelExtension* ext);
-	
+
 	/**
 	 * Concat the given terms into a conjunctive form.
-	 * @todo This is required to automatically transform a state-chart into a 
+	 * @todo This is required to automatically transform a state-chart into a
 	 * state-machine. Actual transformation is still only available in legacy though.
 	 */
 	virtual std::string andExpressions(std::list<std::string>) {
diff --git a/src/uscxml/plugins/EventHandler.h b/src/uscxml/plugins/EventHandler.h
index e08b1ad..436f878 100644
--- a/src/uscxml/plugins/EventHandler.h
+++ b/src/uscxml/plugins/EventHandler.h
@@ -47,7 +47,7 @@ public:
 	 * Return a list of names for types we implement.
 	 */
 	virtual std::list<std::string> getNames() = 0;
-	
+
 	/**
 	 * Export a Data object for the `_x['name']` data-model namespace
 	 * @return An object to be represented at `_x['name']`
diff --git a/src/uscxml/plugins/ExecutableContent.h b/src/uscxml/plugins/ExecutableContent.h
index 14c1d5d..5fb2ac6 100644
--- a/src/uscxml/plugins/ExecutableContent.h
+++ b/src/uscxml/plugins/ExecutableContent.h
@@ -29,7 +29,7 @@
 
 // forward declare
 namespace XERCESC_NS {
-    class DOMElement;
+class DOMElement;
 }
 
 namespace uscxml {
@@ -50,7 +50,7 @@ public:
 	void enterElement(XERCESC_NS::DOMElement* node);
 	void exitElement(XERCESC_NS::DOMElement* node);
 	bool processChildren();
-	
+
 protected:
 	std::shared_ptr<ExecutableContentImpl> _impl;
 
diff --git a/src/uscxml/plugins/IOProcessor.h b/src/uscxml/plugins/IOProcessor.h
index 558edfa..c2b6e30 100644
--- a/src/uscxml/plugins/IOProcessor.h
+++ b/src/uscxml/plugins/IOProcessor.h
@@ -41,7 +41,7 @@ public:
 
 	/// @copydoc IOProcessorImpl::eventFromSCXML
 	virtual void eventFromSCXML(const std::string& target, const Event& event);
-	
+
 	/// @copydoc IOProcessorImpl::isValidTarget
 	virtual bool isValidTarget(const std::string& target);
 
diff --git a/src/uscxml/plugins/IOProcessorImpl.h b/src/uscxml/plugins/IOProcessorImpl.h
index 0e5b44a..bd28406 100644
--- a/src/uscxml/plugins/IOProcessorImpl.h
+++ b/src/uscxml/plugins/IOProcessorImpl.h
@@ -24,6 +24,7 @@
 #include "uscxml/Common.h"
 #include "uscxml/plugins/EventHandler.h"
 #include "uscxml/messages/Event.h"
+#include "uscxml/interpreter/InterpreterImpl.h"
 
 namespace uscxml {
 
@@ -48,7 +49,7 @@ public:
 	 * @param event The event to deliver.
 	 */
 	virtual void eventFromSCXML(const std::string& target, const Event& event) = 0;
-	
+
 	/**
 	 * Determine whether the given target is a valid destination for events.
 	 * @param target A target where the Interpreter wants to deliver Event%s to.
@@ -63,7 +64,7 @@ protected:
 	 * @param type The type of this I/O Processor for `event.origintype`.
 	 * @param origin The origin of this I/O Processor for `event.origin`.
 	 * @param internal If the event is to be delivered to the Interpreter's internal queue instead.
-	 */	
+	 */
 	void eventToSCXML(Event& event, const std::string& type, const std::string& origin, bool internal = false);
 
 };
diff --git a/src/uscxml/plugins/Invoker.h b/src/uscxml/plugins/Invoker.h
index 33a89d6..f5c55d5 100644
--- a/src/uscxml/plugins/Invoker.h
+++ b/src/uscxml/plugins/Invoker.h
@@ -28,8 +28,8 @@
 #include <xercesc/dom/DOM.hpp>
 
 namespace XERCESC_NS {
-    class DOMDocument;
-    class DOMNode;
+class DOMDocument;
+class DOMNode;
 }
 
 namespace uscxml {
diff --git a/src/uscxml/plugins/InvokerImpl.h b/src/uscxml/plugins/InvokerImpl.h
index d8a3410..7f2e578 100644
--- a/src/uscxml/plugins/InvokerImpl.h
+++ b/src/uscxml/plugins/InvokerImpl.h
@@ -25,6 +25,7 @@
 #include "uscxml/Common.h"
 #include "uscxml/plugins/EventHandler.h"
 #include "uscxml/messages/Event.h"
+#include "uscxml/interpreter/InterpreterImpl.h"
 
 namespace uscxml {
 
@@ -39,7 +40,7 @@ class USCXML_API InvokerImpl : public EventHandlerImpl {
 public:
 	InvokerImpl() : _finalize(NULL) {};
 	virtual ~InvokerImpl() {}
-	
+
 	virtual std::list<std::string> getNames() = 0;
 
 	/**
@@ -72,7 +73,7 @@ public:
 	virtual XERCESC_NS::DOMElement* getFinalize() {
 		return _finalize;
 	}
-	
+
 	/**
 	 * Set the finalize XML element associated with this invoker.
 	 * @param finalize The finalize XMl element.
@@ -80,7 +81,7 @@ public:
 	virtual void setFinalize(XERCESC_NS::DOMElement* finalize) {
 		_finalize = finalize;
 	}
-	
+
 	/**
 	 * Set the invocation identifier as required when returning events.
 	 * @param invokeId The invocation identifier.
@@ -96,7 +97,7 @@ protected:
 	 * @param type The type of this I/O Processor for `event.origintype`.
 	 * @param invokeId The invocation identifier of this invocation for `event.invokeid`.
 	 * @param internal If the event is to be delivered to the Interpreter's internal queue instead.
-	 */	
+	 */
 	void eventToSCXML(Event& event, const std::string& type, const std::string& invokeId, bool internal = false);
 
 	XERCESC_NS::DOMElement* _finalize;