Changed Monitor signature to take Interpreter facade

2 files changed, 34 insertions, 25 deletions

diff --git a/src/bindings/swig/wrapped/WrappedInterpreterMonitor.cpp b/src/bindings/swig/wrapped/WrappedInterpreterMonitor.cpp
index a89ff54..cdb46de 100644
--- a/src/bindings/swig/wrapped/WrappedInterpreterMonitor.cpp
+++ b/src/bindings/swig/wrapped/WrappedInterpreterMonitor.cpp
@@ -30,31 +30,31 @@ using namespace XERCESC_NS;
 WrappedInterpreterMonitor::WrappedInterpreterMonitor() {}
 WrappedInterpreterMonitor::~WrappedInterpreterMonitor() {}
 
-void WrappedInterpreterMonitor::beforeExitingState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state) {
+void WrappedInterpreterMonitor::beforeExitingState(Interpreter& interpreter, const XERCESC_NS::DOMElement* state) {
     std::stringstream ss;
     ss << *state;
     beforeExitingState(ATTR(state, "id"), DOMUtils::xPathForNode(state), ss.str());
 }
 
-void WrappedInterpreterMonitor::afterExitingState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state) {
+void WrappedInterpreterMonitor::afterExitingState(Interpreter& interpreter, const XERCESC_NS::DOMElement* state) {
     std::stringstream ss;
     ss << *state;
     afterExitingState(ATTR(state, "id"), DOMUtils::xPathForNode(state), ss.str());
 }
 
-void WrappedInterpreterMonitor::beforeExecutingContent(InterpreterImpl* impl, const XERCESC_NS::DOMElement* content) {
+void WrappedInterpreterMonitor::beforeExecutingContent(Interpreter& interpreter, const XERCESC_NS::DOMElement* content) {
     std::stringstream ss;
     ss << *content;
     beforeExecutingContent(TAGNAME(content), DOMUtils::xPathForNode(content), ss.str());
 }
 
-void WrappedInterpreterMonitor::afterExecutingContent(InterpreterImpl* impl, const XERCESC_NS::DOMElement* content) {
+void WrappedInterpreterMonitor::afterExecutingContent(Interpreter& interpreter, const XERCESC_NS::DOMElement* content) {
     std::stringstream ss;
     ss << *content;
     afterExecutingContent(TAGNAME(content), DOMUtils::xPathForNode(content), ss.str());
 }
 
-void WrappedInterpreterMonitor::beforeUninvoking(InterpreterImpl* impl, const XERCESC_NS::DOMElement* invoker, const std::string& invokeid) {
+void WrappedInterpreterMonitor::beforeUninvoking(Interpreter& interpreter, const XERCESC_NS::DOMElement* invoker, const std::string& invokeid) {
     std::stringstream ss;
     ss << *invoker;
     std::string invokeId;
@@ -65,7 +65,7 @@ void WrappedInterpreterMonitor::beforeUninvoking(InterpreterImpl* impl, const XE
     beforeUninvoking(DOMUtils::xPathForNode(invoker), invokeId, ss.str());
 }
 
-void WrappedInterpreterMonitor::afterUninvoking(InterpreterImpl* impl, const XERCESC_NS::DOMElement* invoker, const std::string& invokeid) {
+void WrappedInterpreterMonitor::afterUninvoking(Interpreter& interpreter, const XERCESC_NS::DOMElement* invoker, const std::string& invokeid) {
     std::stringstream ss;
     ss << *invoker;
     std::string invokeId;
@@ -76,7 +76,7 @@ void WrappedInterpreterMonitor::afterUninvoking(InterpreterImpl* impl, const XER
     afterUninvoking(DOMUtils::xPathForNode(invoker), invokeId, ss.str());
 }
 
-void WrappedInterpreterMonitor::beforeTakingTransition(InterpreterImpl* impl, const XERCESC_NS::DOMElement* transition) {
+void WrappedInterpreterMonitor::beforeTakingTransition(Interpreter& interpreter, const XERCESC_NS::DOMElement* transition) {
     XERCESC_NS::DOMElement* sourceState = getSourceState(transition);
     const XERCESC_NS::DOMElement* root = DOMUtils::getNearestAncestor(transition, "scxml");
 
@@ -93,7 +93,7 @@ void WrappedInterpreterMonitor::beforeTakingTransition(InterpreterImpl* impl, co
     beforeTakingTransition(DOMUtils::xPathForNode(transition), ATTR_CAST(sourceState, "id"), targets, ss.str());
 }
 
-void WrappedInterpreterMonitor::afterTakingTransition(InterpreterImpl* impl, const XERCESC_NS::DOMElement* transition) {
+void WrappedInterpreterMonitor::afterTakingTransition(Interpreter& interpreter, const XERCESC_NS::DOMElement* transition) {
     XERCESC_NS::DOMElement* sourceState = getSourceState(transition);
     const XERCESC_NS::DOMElement* root = DOMUtils::getNearestAncestor(transition, "scxml");
     
@@ -110,19 +110,19 @@ void WrappedInterpreterMonitor::afterTakingTransition(InterpreterImpl* impl, con
     afterTakingTransition(DOMUtils::xPathForNode(transition), ATTR_CAST(sourceState, "id"), targets, ss.str());
 }
 
-void WrappedInterpreterMonitor::beforeEnteringState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state) {
+void WrappedInterpreterMonitor::beforeEnteringState(Interpreter& interpreter, const XERCESC_NS::DOMElement* state) {
     std::stringstream ss;
     ss << *state;
     beforeEnteringState(ATTR(state, "id"), DOMUtils::xPathForNode(state), ss.str());
 }
 
-void WrappedInterpreterMonitor::afterEnteringState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state) {
+void WrappedInterpreterMonitor::afterEnteringState(Interpreter& interpreter, const XERCESC_NS::DOMElement* state) {
     std::stringstream ss;
     ss << *state;
     afterEnteringState(ATTR(state, "id"), DOMUtils::xPathForNode(state), ss.str());
 }
 
-void WrappedInterpreterMonitor::beforeInvoking(InterpreterImpl* impl, const XERCESC_NS::DOMElement* invoker, const std::string& invokeid) {
+void WrappedInterpreterMonitor::beforeInvoking(Interpreter& interpreter, const XERCESC_NS::DOMElement* invoker, const std::string& invokeid) {
     std::stringstream ss;
     ss << *invoker;
     std::string invokeId;
@@ -133,7 +133,7 @@ void WrappedInterpreterMonitor::beforeInvoking(InterpreterImpl* impl, const XERC
     beforeInvoking(DOMUtils::xPathForNode(invoker), invokeId, ss.str());
 }
 
-void WrappedInterpreterMonitor::afterInvoking(InterpreterImpl* impl, const XERCESC_NS::DOMElement* invoker, const std::string& invokeid) {
+void WrappedInterpreterMonitor::afterInvoking(Interpreter& interpreter, const XERCESC_NS::DOMElement* invoker, const std::string& invokeid) {
     std::stringstream ss;
     ss << *invoker;
     std::string invokeId;
diff --git a/src/bindings/swig/wrapped/WrappedInterpreterMonitor.h b/src/bindings/swig/wrapped/WrappedInterpreterMonitor.h
index c5655cf..e05dad2 100644
--- a/src/bindings/swig/wrapped/WrappedInterpreterMonitor.h
+++ b/src/bindings/swig/wrapped/WrappedInterpreterMonitor.h
@@ -44,31 +44,34 @@ public:
 	WrappedInterpreterMonitor();
 	virtual ~WrappedInterpreterMonitor();
 
-    void beforeExitingState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state);
+    virtual void beforeProcessingEvent(Interpreter& interpreter, const Event& event) {}
+    virtual void beforeMicroStep(Interpreter& interpreter) {}
+
+    void beforeExitingState(Interpreter& interpreter, const XERCESC_NS::DOMElement* state);
     virtual void beforeExitingState(const std::string& stateId,
 	                                const std::string& xpath,
 	                                const std::string& stateXML) {}
 
 
-    void afterExitingState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state);
+    void afterExitingState(Interpreter& interpreter, const XERCESC_NS::DOMElement* state);
     virtual void afterExitingState(const std::string& stateId,
                                    const std::string& xpath,
                                    const std::string& stateXML) {}
 
 
-    void beforeExecutingContent(InterpreterImpl* impl, const XERCESC_NS::DOMElement* content);
+    void beforeExecutingContent(Interpreter& interpreter, const XERCESC_NS::DOMElement* content);
     virtual void beforeExecutingContent(const std::string& tagName,
 	                                    const std::string& xpath,
 	                                    const std::string& contentXML) {}
 
 
-    void afterExecutingContent(InterpreterImpl* impl, const XERCESC_NS::DOMElement* content);
+    void afterExecutingContent(Interpreter& interpreter, const XERCESC_NS::DOMElement* content);
     virtual void afterExecutingContent(const std::string& tagName,
 	                                   const std::string& xpath,
 	                                   const std::string& contentXML) {}
 
 
-	void beforeUninvoking(InterpreterImpl* impl,
+	void beforeUninvoking(Interpreter& interpreter,
                           const XERCESC_NS::DOMElement* invoker,
                           const std::string& invokeid);
 	virtual void beforeUninvoking(const std::string& xpath,
@@ -76,7 +79,7 @@ public:
 	                              const std::string& invokerXML) {}
 
 
-	void afterUninvoking(InterpreterImpl* impl,
+	void afterUninvoking(Interpreter& interpreter,
                          const XERCESC_NS::DOMElement* invoker,
                          const std::string& invokeid);
     virtual void afterUninvoking(const std::string& xpath,
@@ -84,14 +87,14 @@ public:
 	                             const std::string& invokerXML) {}
 
 
-    void beforeTakingTransition(InterpreterImpl* impl,
+    void beforeTakingTransition(Interpreter& interpreter,
                                 const XERCESC_NS::DOMElement* transition);
 	virtual void beforeTakingTransition(const std::string& xpath,
 	                                    const std::string& source,
 	                                    const std::list<std::string>& targets,
 	                                    const std::string& transitionXML) {}
 
-    void afterTakingTransition(InterpreterImpl* impl,
+    void afterTakingTransition(Interpreter& interpreter,
                                const XERCESC_NS::DOMElement* transition);
     virtual void afterTakingTransition(const std::string& xpath,
 	                                   const std::string& source,
@@ -99,35 +102,41 @@ public:
 	                                   const std::string& transitionXML) {}
 
 
-    void beforeEnteringState(InterpreterImpl* impl,
+    void beforeEnteringState(Interpreter& interpreter,
                              const XERCESC_NS::DOMElement* state);
     virtual void beforeEnteringState(const std::string& stateId,
 	                                 const std::string& xpath,
 	                                 const std::string& stateXML) {}
 
 
-    void afterEnteringState(InterpreterImpl* impl,
+    void afterEnteringState(Interpreter& interpreter,
                             const XERCESC_NS::DOMElement* state);
     virtual void afterEnteringState(const std::string& stateId,
 	                                const std::string& xpath,
 	                                const std::string& stateXML) {}
 
 
-	void beforeInvoking(InterpreterImpl* impl,
+	void beforeInvoking(Interpreter& interpreter,
                         const XERCESC_NS::DOMElement* invoker,
                         const std::string& invokeid);
     virtual void beforeInvoking(const std::string& xpath,
 	                            const std::string& invokeid,
 	                            const std::string& invokerXML) {}
 
-    void afterInvoking(InterpreterImpl* impl,
+    void afterInvoking(Interpreter& interpreter,
                        const XERCESC_NS::DOMElement* invoker,
                        const std::string& invokeid);
     virtual void afterInvoking(const std::string& xpath,
 	                           const std::string& invokeid,
 	                           const std::string& invokerXML) {}
 
-	virtual void reportIssue(InterpreterImpl* impl,
+    virtual void afterMicroStep(Interpreter& interpreter) {}
+    virtual void onStableConfiguration(Interpreter& interpreter) {}
+    
+    virtual void beforeCompletion(Interpreter& interpreter) {}
+    virtual void afterCompletion(Interpreter& interpreter) {}
+
+	virtual void reportIssue(Interpreter& interpreter,
                              const InterpreterIssue& issue) {}
 };