diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-04-09 22:51:16 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-04-09 22:51:16 (GMT) |
commit | 8a9b432d36e5748898abffe9f1607d93e45bab4b (patch) | |
tree | 0b95e832a9b3b2daf9ae45bf81084eda580752a0 /src/uscxml/debug | |
parent | 7d98ac1fd2e9da3162f3b6d38b22106f463edd9d (diff) | |
download | uscxml-8a9b432d36e5748898abffe9f1607d93e45bab4b.zip uscxml-8a9b432d36e5748898abffe9f1607d93e45bab4b.tar.gz uscxml-8a9b432d36e5748898abffe9f1607d93e45bab4b.tar.bz2 |
Started with promela datamodel
Diffstat (limited to 'src/uscxml/debug')
-rw-r--r-- | src/uscxml/debug/Debugger.cpp | 16 | ||||
-rw-r--r-- | src/uscxml/debug/Debugger.h | 18 | ||||
-rw-r--r-- | src/uscxml/debug/DebuggerServlet.cpp | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/uscxml/debug/Debugger.cpp b/src/uscxml/debug/Debugger.cpp index 4fe677c..f611d09 100644 --- a/src/uscxml/debug/Debugger.cpp +++ b/src/uscxml/debug/Debugger.cpp @@ -84,28 +84,28 @@ std::list<Breakpoint> getQualifiedTransBreakpoints(Interpreter interpreter, cons return breakpoints; } -void Debugger::beforeTakingTransition(Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition) { +void Debugger::beforeTakingTransition(Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition, bool moreComing) { handleTransition(interpreter, transition, Breakpoint::BEFORE); } -void Debugger::afterTakingTransition(Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition) { +void Debugger::afterTakingTransition(Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition, bool moreComing) { handleTransition(interpreter, transition, Breakpoint::AFTER); } -void Debugger::beforeExecutingContent(Interpreter interpreter, const Arabica::DOM::Node<std::string>& content) { +void Debugger::beforeExecutingContent(Interpreter interpreter, const Arabica::DOM::Element<std::string>& content) { handleExecutable(interpreter, Arabica::DOM::Element<std::string>(content), Breakpoint::BEFORE); } -void Debugger::afterExecutingContent(Interpreter interpreter, const Arabica::DOM::Node<std::string>& content) { +void Debugger::afterExecutingContent(Interpreter interpreter, const Arabica::DOM::Element<std::string>& content) { handleExecutable(interpreter, Arabica::DOM::Element<std::string>(content), Breakpoint::AFTER); } -void Debugger::beforeExitingState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state) { +void Debugger::beforeExitingState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing) { handleState(interpreter, state, Breakpoint::BEFORE, Breakpoint::EXIT); } -void Debugger::afterExitingState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state) { +void Debugger::afterExitingState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing) { handleState(interpreter, state, Breakpoint::AFTER, Breakpoint::EXIT); } -void Debugger::beforeEnteringState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state) { +void Debugger::beforeEnteringState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing) { handleState(interpreter, state, Breakpoint::BEFORE, Breakpoint::ENTER); } -void Debugger::afterEnteringState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state) { +void Debugger::afterEnteringState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing) { handleState(interpreter, state, Breakpoint::AFTER, Breakpoint::ENTER); } void Debugger::beforeUninvoking(Interpreter interpreter, const Arabica::DOM::Element<std::string>& invokeElem, const std::string& invokeid) { diff --git a/src/uscxml/debug/Debugger.h b/src/uscxml/debug/Debugger.h index c49e90f..8f840b0 100644 --- a/src/uscxml/debug/Debugger.h +++ b/src/uscxml/debug/Debugger.h @@ -55,21 +55,19 @@ public: // InterpreterMonitor virtual void beforeProcessingEvent(Interpreter interpreter, const Event& event); virtual void beforeMicroStep(Interpreter interpreter); - virtual void beforeExecutingContent(Interpreter interpreter, const Arabica::DOM::Node<std::string>& content); - virtual void afterExecutingContent(Interpreter interpreter, const Arabica::DOM::Node<std::string>& content); - virtual void beforeExitingState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state); - virtual void afterExitingState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state); + virtual void beforeExitingState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing); + virtual void afterExitingState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing); + virtual void beforeExecutingContent(Interpreter interpreter, const Arabica::DOM::Element<std::string>& element); + virtual void afterExecutingContent(Interpreter interpreter, const Arabica::DOM::Element<std::string>& element); virtual void beforeUninvoking(Interpreter interpreter, const Arabica::DOM::Element<std::string>& invokeElem, const std::string& invokeid); virtual void afterUninvoking(Interpreter interpreter, const Arabica::DOM::Element<std::string>& invokeElem, const std::string& invokeid); - virtual void beforeTakingTransition(Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition); - virtual void afterTakingTransition(Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition); - virtual void beforeEnteringState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state); - virtual void afterEnteringState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state); + virtual void beforeTakingTransition(Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition, bool moreComing); + virtual void afterTakingTransition(Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition, bool moreComing); + virtual void beforeEnteringState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing); + virtual void afterEnteringState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing); virtual void beforeInvoking(Interpreter interpreter, const Arabica::DOM::Element<std::string>& invokeElem, const std::string& invokeid); virtual void afterInvoking(Interpreter interpreter, const Arabica::DOM::Element<std::string>& invokeElem, const std::string& invokeid); virtual void afterMicroStep(Interpreter interpreter); - virtual void beforeExecutingContent(Interpreter interpreter, const Arabica::DOM::Element<std::string>& element) {} - virtual void afterExecutingContent(Interpreter interpreter, const Arabica::DOM::Element<std::string>& element) {} virtual void onStableConfiguration(Interpreter interpreter); virtual void beforeCompletion(Interpreter interpreter) {} virtual void afterCompletion(Interpreter interpreter); diff --git a/src/uscxml/debug/DebuggerServlet.cpp b/src/uscxml/debug/DebuggerServlet.cpp index 55ced75..12783b4 100644 --- a/src/uscxml/debug/DebuggerServlet.cpp +++ b/src/uscxml/debug/DebuggerServlet.cpp @@ -56,6 +56,8 @@ void DebuggerServlet::returnData(const HTTPServer::Request& request, Data replyD replyData.compound["status"] = Data("success", Data::VERBATIM); } + std::cout << "<- " << replyData << std::endl; + reply.content = Data::toJSON(replyData); reply.headers["Access-Control-Allow-Origin"] = "*"; reply.headers["Content-Type"] = "application/json"; |