From 49e851a2646f7ae37df34b3c66388f8778fef5af Mon Sep 17 00:00:00 2001 From: Alexander Aksenov Date: Fri, 27 Apr 2018 20:16:00 +0300 Subject: [PATCH] Refactor MIProtocol Make non-interface methods private Signed-off-by: Alexander Aksenov --- src/debug/netcoredbg/miprotocol.cpp | 4 ++-- src/debug/netcoredbg/miprotocol.h | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/debug/netcoredbg/miprotocol.cpp b/src/debug/netcoredbg/miprotocol.cpp index a7601ae..9ad410e 100644 --- a/src/debug/netcoredbg/miprotocol.cpp +++ b/src/debug/netcoredbg/miprotocol.cpp @@ -117,7 +117,7 @@ bool ParseBreakpoint(const std::vector &args_orig, std::string &fil } -static HRESULT PrintBreakpoint(const Breakpoint &b, std::string &output) +HRESULT MIProtocol::PrintBreakpoint(const Breakpoint &b, std::string &output) { HRESULT Status; @@ -269,7 +269,7 @@ HRESULT MIProtocol::PrintVariables(const std::vector &variables, std:: return S_OK; } -static void PrintVar(const std::string &varobjName, Variable &v, int threadId, int print_values, std::string &output) +void MIProtocol::PrintVar(const std::string &varobjName, Variable &v, int threadId, int print_values, std::string &output) { std::ostringstream ss; diff --git a/src/debug/netcoredbg/miprotocol.h b/src/debug/netcoredbg/miprotocol.h index e349915..037c319 100644 --- a/src/debug/netcoredbg/miprotocol.h +++ b/src/debug/netcoredbg/miprotocol.h @@ -22,8 +22,13 @@ class MIProtocol : public Protocol unsigned int m_varCounter; std::unordered_map m_vars; std::unordered_map > m_breakpoints; -public: + static std::string EscapeMIValue(const std::string &str); + static HRESULT PrintBreakpoint(const Breakpoint &b, std::string &output); + static void PrintVar(const std::string &varobjName, Variable &v, int threadId, int print_values, std::string &output); + static void Printf(const char *fmt, ...) __attribute__((format (printf, 1, 2))); + +public: MIProtocol() : Protocol(), m_varCounter(0) {} void EmitInitializedEvent() override {} @@ -38,8 +43,6 @@ public: void Cleanup() override; void CommandLoop() override; - static void Printf(const char *fmt, ...) __attribute__((format (printf, 1, 2))); - private: HRESULT HandleCommand(std::string command, const std::vector &args, -- 2.34.1