1 files changed, 23 insertions, 0 deletions
diff --git a/src/uscxml/Factory.h b/src/uscxml/Factory.h
index 0011547..9997b15 100644
--- a/src/uscxml/Factory.h
+++ b/src/uscxml/Factory.h
@@ -123,6 +123,14 @@ public:
 		_type = type;
 	}
 
+	void setElement(const Arabica::DOM::Element<std::string>& element) {
+		_element = element;
+	}
+	
+	Arabica::DOM::Element<std::string> getElement() {
+		return _element;
+	}
+
 	virtual Data getDataModelVariables() = 0;
 	virtual void send(const SendRequest& req) = 0;
 
@@ -133,6 +141,7 @@ public:
 
 protected:
 	InterpreterImpl* _interpreter;
+	Arabica::DOM::Element<std::string> _element;
 	std::string _invokeId;
 	std::string _type;
 
@@ -169,6 +178,14 @@ public:
 		_impl->setType(type);
 	}
 
+	void setElement(const Arabica::DOM::Element<std::string>& element) {
+		_impl->setElement(element);
+	}
+	
+	Arabica::DOM::Element<std::string> getElement() {
+		return _impl->getElement();
+	}
+
 protected:
 	boost::shared_ptr<EventHandlerImpl> _impl;
 	friend class InterpreterImpl;
@@ -299,6 +316,8 @@ public:
 		_interpreter = interpreter;
 	}
 
+	virtual std::string andExpressions(std::list<std::string>) { return ""; }
+	
 	// we need it public for various static functions
 	InterpreterImpl* _interpreter;
 };
@@ -399,6 +418,10 @@ public:
 		return _impl->replaceExpressions(content);
 	}
 
+	std::string andExpressions(std::list<std::string> expressions) {
+		return _impl->andExpressions(expressions);
+	}
+
 	virtual void setInterpreter(InterpreterImpl* interpreter) {
 		_impl->setInterpreter(interpreter);
 	}