Started to port Debugger and issue 87

5 files changed, 30 insertions, 30 deletions

diff --git a/test/src/test-lifecycle.cpp b/test/src/test-lifecycle.cpp
index 14ebd94..81fc363 100644
--- a/test/src/test-lifecycle.cpp
+++ b/test/src/test-lifecycle.cpp
@@ -48,67 +48,67 @@ std::list<CallbackType> callBackSeq;
 
 
 class SequenceCheckingMonitor : public InterpreterMonitor {
-	virtual void beforeProcessingEvent(const Event& event) {
+	virtual void beforeProcessingEvent(InterpreterImpl* impl, const Event& event) {
 		CHECK_CALLBACK_TYPE(USCXML_BEFOREPROCESSINGEVENT);
 	}
-	virtual void beforeMicroStep() {
+	virtual void beforeMicroStep(InterpreterImpl* impl) {
 		CHECK_CALLBACK_TYPE(USCXML_BEFOREMICROSTEP);
 	}
 
-	virtual void beforeExitingState(const XERCESC_NS::DOMElement* state) {
+	virtual void beforeExitingState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state) {
 		CHECK_CALLBACK_TYPE(USCXML_BEFOREEXITINGSTATE);
 	}
-	virtual void afterExitingState(const XERCESC_NS::DOMElement* state) {
+	virtual void afterExitingState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state) {
 		CHECK_CALLBACK_TYPE(USCXML_AFTEREXITINGSTATE);
 	}
 
-	virtual void beforeExecutingContent(const XERCESC_NS::DOMElement* element) {
+	virtual void beforeExecutingContent(InterpreterImpl* impl, const XERCESC_NS::DOMElement* element) {
 		CHECK_CALLBACK_TYPE(USCXML_BEFOREEXECUTINGCONTENT);
 	}
-	virtual void afterExecutingContent(const XERCESC_NS::DOMElement* element) {
+	virtual void afterExecutingContent(InterpreterImpl* impl, const XERCESC_NS::DOMElement* element) {
 		CHECK_CALLBACK_TYPE(USCXML_AFTEREXECUTINGCONTENT);
 	}
 
-	virtual void beforeUninvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {
+	virtual void beforeUninvoking(InterpreterImpl* impl, const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {
 		CHECK_CALLBACK_TYPE(USCXML_BEFOREUNINVOKING);
 	}
-	virtual void afterUninvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {
+	virtual void afterUninvoking(InterpreterImpl* impl, const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {
 		CHECK_CALLBACK_TYPE(USCXML_AFTERUNINVOKING);
 	}
 
-	virtual void beforeTakingTransition(const XERCESC_NS::DOMElement* transition) {
+	virtual void beforeTakingTransition(InterpreterImpl* impl, const XERCESC_NS::DOMElement* transition) {
 		CHECK_CALLBACK_TYPE(USCXML_BEFORETAKINGTRANSITION);
 	}
-	virtual void afterTakingTransition(const XERCESC_NS::DOMElement* transition) {
+	virtual void afterTakingTransition(InterpreterImpl* impl, const XERCESC_NS::DOMElement* transition) {
 		CHECK_CALLBACK_TYPE(USCXML_AFTERTAKINGTRANSITION);
 	}
 
-	virtual void beforeEnteringState(const XERCESC_NS::DOMElement* state) {
+	virtual void beforeEnteringState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state) {
 		CHECK_CALLBACK_TYPE(USCXML_BEFOREENTERINGSTATE);
 	}
-	virtual void afterEnteringState(const XERCESC_NS::DOMElement* state) {
+	virtual void afterEnteringState(InterpreterImpl* impl, const XERCESC_NS::DOMElement* state) {
 		CHECK_CALLBACK_TYPE(USCXML_AFTERENTERINGSTATE);
 	}
 
-	virtual void beforeInvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {
+	virtual void beforeInvoking(InterpreterImpl* impl, const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {
 		CHECK_CALLBACK_TYPE(USCXML_BEFOREINVOKING);
 	}
-	virtual void afterInvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {
+	virtual void afterInvoking(InterpreterImpl* impl, const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {
 		CHECK_CALLBACK_TYPE(USCXML_AFTERINVOKING);
 	}
 
-	virtual void afterMicroStep() {
+	virtual void afterMicroStep(InterpreterImpl* impl) {
 		CHECK_CALLBACK_TYPE(USCXML_AFTERMICROSTEP);
 	}
 
-	virtual void onStableConfiguration() {
+	virtual void onStableConfiguration(InterpreterImpl* impl) {
 		CHECK_CALLBACK_TYPE(USCXML_ONSTABLECONFIGURATION);
 	}
 
-	virtual void beforeCompletion() {
+	virtual void beforeCompletion(InterpreterImpl* impl) {
 		CHECK_CALLBACK_TYPE(USCXML_BEFORECOMPLETION);
 	}
-	virtual void afterCompletion() {
+	virtual void afterCompletion(InterpreterImpl* impl) {
 		CHECK_CALLBACK_TYPE(USCXML_AFTERCOMPLETION);
 	}
 
@@ -139,7 +139,7 @@ int main(int argc, char** argv) {
 			try {
 				const char* xml = "<invalid />";
 				Interpreter interpreter = Interpreter::fromXML(xml, "");
-				interpreter.setMonitor(&mon);
+				interpreter.addMonitor(&mon);
 				assert(interpreter.getState() == USCXML_INSTANTIATED);
 				interpreter.step();
 				assert(false);
@@ -159,7 +159,7 @@ int main(int argc, char** argv) {
 				    " <final id=\"done\" />"
 				    "</scxml>";
 				Interpreter interpreter = Interpreter::fromXML(xml, "");
-				interpreter.setMonitor(&mon);
+				interpreter.addMonitor(&mon);
 				assert(interpreter.getState() == USCXML_INSTANTIATED);
 				interpreter.step();
 				assert(false);
@@ -182,7 +182,7 @@ int main(int argc, char** argv) {
 			    "</scxml>";
 
 			Interpreter interpreter = Interpreter::fromXML(xml, "");
-			interpreter.setMonitor(&mon);
+			interpreter.addMonitor(&mon);
 
 			callBackSeq.push_back(USCXML_BEFOREMICROSTEP);
 			callBackSeq.push_back(USCXML_BEFOREENTERINGSTATE); // scxml
@@ -232,7 +232,7 @@ int main(int argc, char** argv) {
 			    "</scxml>";
 
 			Interpreter interpreter = Interpreter::fromXML(xml, "");
-			interpreter.setMonitor(&mon);
+			interpreter.addMonitor(&mon);
 
 			callBackSeq.push_back(USCXML_BEFOREMICROSTEP);
 			callBackSeq.push_back(USCXML_BEFOREENTERINGSTATE); // scxml
@@ -304,7 +304,7 @@ int main(int argc, char** argv) {
 			    "</scxml>";
 
 			Interpreter interpreter = Interpreter::fromXML(xml, "");
-			interpreter.setMonitor(&mon);
+			interpreter.addMonitor(&mon);
 			callBackSeq.push_back(USCXML_BEFOREMICROSTEP);
 			callBackSeq.push_back(USCXML_BEFOREENTERINGSTATE); // scxml
 			callBackSeq.push_back(USCXML_AFTERENTERINGSTATE);
diff --git a/test/src/test-state-pass.cpp b/test/src/test-state-pass.cpp
index ac52a0b..afda506 100644
--- a/test/src/test-state-pass.cpp
+++ b/test/src/test-state-pass.cpp
@@ -73,11 +73,11 @@ int main(int argc, char** argv) {
 //			interpreter.setActionLanguage(al);
 
 			StateTransitionMonitor mon;
-			interpreter.setMonitor(&mon);
+			interpreter.addMonitor(&mon);
 
 			InterpreterState state = InterpreterState::USCXML_UNDEF;
 			while(state != USCXML_FINISHED) {
-				state = interpreter.step(true);
+				state = interpreter.step();
 			}
 			assert(interpreter.isInState("pass"));
 		} catch (Event e) {
diff --git a/test/src/test-stress.cpp b/test/src/test-stress.cpp
index 8bd2e4a..dc54f4e 100644
--- a/test/src/test-stress.cpp
+++ b/test/src/test-stress.cpp
@@ -16,7 +16,7 @@ int startedAt;
 int lastTransitionAt;
 
 class StatusMonitor : public uscxml::InterpreterMonitor {
-	void beforeTakingTransition(const XERCESC_NS::DOMElement* transition) {
+	void beforeTakingTransition(uscxml::InterpreterImpl* impl, const XERCESC_NS::DOMElement* transition) {
 		lastTransitionAt = time(NULL);
 	}
 
@@ -81,7 +81,7 @@ int main(int argc, char** argv) {
         LOG(INFO) << "Processing " << interpreter.getImpl()->getBaseURL();
 		if (interpreter) {
 
-			interpreter.setMonitor(&vm);
+			interpreter.addMonitor(&vm);
 
             InterpreterState state = InterpreterState::USCXML_UNDEF;
             int now = time(NULL);
diff --git a/test/src/test-url.cpp b/test/src/test-url.cpp
index aa559f3..0e1d115 100644
--- a/test/src/test-url.cpp
+++ b/test/src/test-url.cpp
@@ -137,7 +137,7 @@ int main(int argc, char** argv) {
 //    assert(foo.isAbsolute());

 

 

-	HTTPServer::getInstance(8099, 8100);

+	HTTPServer::getInstance(8199, 8200);

 

 	std::string exeName = argv[0];

 	exeName = exeName.substr(exeName.find_last_of("\\/") + 1);

diff --git a/test/src/test-validating.cpp b/test/src/test-validating.cpp
index 840a105..c3bc693 100644
--- a/test/src/test-validating.cpp
+++ b/test/src/test-validating.cpp
@@ -31,7 +31,7 @@ public:
 	IssueMonitor() {
 		runtimeIssues = 0;
 	}
-	void reportIssue(const InterpreterIssue& issue) {
+	void reportIssue(InterpreterImpl* impl, const InterpreterIssue& issue) {
 		runtimeIssues++;
 	}
 };
@@ -60,7 +60,7 @@ int main(int argc, char** argv) {
 
 			IssueMonitor monitor;
 			Interpreter interpreter = Interpreter::fromXML(xml, "");
-			interpreter.setMonitor(&monitor);
+			interpreter.addMonitor(&monitor);
 
 			while(interpreter.step() > 0) {}