summaryrefslogtreecommitdiffstats
path: root/lldb/tools/lldb-mi
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/tools/lldb-mi')
-rw-r--r--lldb/tools/lldb-mi/MICmdArgSet.h16
-rw-r--r--lldb/tools/lldb-mi/MICmdArgValBase.cpp16
-rw-r--r--lldb/tools/lldb-mi/MICmdArgValBase.h42
-rw-r--r--lldb/tools/lldb-mi/MICmdBase.h36
4 files changed, 39 insertions, 71 deletions
diff --git a/lldb/tools/lldb-mi/MICmdArgSet.h b/lldb/tools/lldb-mi/MICmdArgSet.h
index c5001048da7..2b4392565e0 100644
--- a/lldb/tools/lldb-mi/MICmdArgSet.h
+++ b/lldb/tools/lldb-mi/MICmdArgSet.h
@@ -9,10 +9,12 @@
#pragma once
-// Third party headers:
+// C Includes
+// C++ Includes
#include <vector>
-// In-house headers:
+// Other libraries and framework includes
+// Project includes
#include "MICmnBase.h"
#include "MICmdArgContext.h"
@@ -49,16 +51,14 @@ class CMICmdArgSet : public CMICmnBase
virtual bool GetValid() const = 0;
virtual bool Validate(CMICmdArgContext &vwArgContext) = 0;
- /* dtor */ virtual ~IArg(){}
+ virtual ~IArg() = default;
};
// Typedefs:
- public:
typedef std::vector<CMICmdArgValBase *> SetCmdArgs_t;
// Methods:
- public:
- /* ctor */ CMICmdArgSet();
+ CMICmdArgSet();
void Add(CMICmdArgValBase *vArg);
bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const;
@@ -71,8 +71,7 @@ class CMICmdArgSet : public CMICmnBase
bool Validate(const CMIUtilString &vStrMiCmd, CMICmdArgContext &vwCmdArgsText);
// Overrideable:
- public:
- /* dtor */ virtual ~CMICmdArgSet();
+ ~CMICmdArgSet() override;
// Methods:
private:
@@ -82,7 +81,6 @@ class CMICmdArgSet : public CMICmnBase
bool ValidationFormErrorMessages(const CMICmdArgContext &vwCmdArgsText);
// Attributes:
- private:
bool m_bIsArgsPresentButNotHandledByCmd; // True = The driver's client presented the command with options recognised but not handled by
// a command, false = all args handled
SetCmdArgs_t m_setCmdArgs; // The set of arguments that are that the command is expecting to find in the options string
diff --git a/lldb/tools/lldb-mi/MICmdArgValBase.cpp b/lldb/tools/lldb-mi/MICmdArgValBase.cpp
index 15173c24c0d..ddbf957ea47 100644
--- a/lldb/tools/lldb-mi/MICmdArgValBase.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValBase.cpp
@@ -7,7 +7,10 @@
//
//===----------------------------------------------------------------------===//
-// In-house headers:
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
#include "MICmdArgValBase.h"
#include "MIUtilString.h"
#include "MICmdArgContext.h"
@@ -48,17 +51,6 @@ CMICmdArgValBase::CMICmdArgValBase(const CMIUtilString &vrArgName, const bool vb
}
//++ ------------------------------------------------------------------------------------
-// Details: CMICmdArgValBase destructor.
-// Type: Overrideable.
-// Args: None.
-// Return: None.
-// Throws: None.
-//--
-CMICmdArgValBase::~CMICmdArgValBase()
-{
-}
-
-//++ ------------------------------------------------------------------------------------
// Details: Retrieve the state flag of whether the argument is handled by the command or
// not.
// Type: Method.
diff --git a/lldb/tools/lldb-mi/MICmdArgValBase.h b/lldb/tools/lldb-mi/MICmdArgValBase.h
index d537c54e40e..c343b3338c3 100644
--- a/lldb/tools/lldb-mi/MICmdArgValBase.h
+++ b/lldb/tools/lldb-mi/MICmdArgValBase.h
@@ -9,7 +9,10 @@
#pragma once
-// In-house headers:
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
#include "MIUtilString.h"
#include "MICmdArgSet.h"
@@ -35,15 +38,13 @@ class CMICmdArgValBase : public CMICmdArgSet::IArg
{
// Methods:
public:
- /* ctor */ CMICmdArgValBase();
- /* ctor */ CMICmdArgValBase(const CMIUtilString &vrArgName, const bool vbMandatory, const bool vbHandleByCmd);
+ CMICmdArgValBase();
+ CMICmdArgValBase(const CMIUtilString &vrArgName, const bool vbMandatory, const bool vbHandleByCmd);
// Overrideable:
- public:
- /* dtor */ ~CMICmdArgValBase() override;
+ ~CMICmdArgValBase() override = default;
// Overridden:
- public:
// From CMICmdArgSet::IArg
bool GetFound() const override;
bool GetIsHandledByCmd() const override;
@@ -70,14 +71,13 @@ template <class T> class CMICmdArgValBaseTemplate : public CMICmdArgValBase
{
// Methods:
public:
- /* ctor */ CMICmdArgValBaseTemplate();
- /* ctor */ CMICmdArgValBaseTemplate(const CMIUtilString &vrArgName, const bool vbMandatory, const bool vbHandleByCmd);
+ CMICmdArgValBaseTemplate() = default;
+ CMICmdArgValBaseTemplate(const CMIUtilString &vrArgName, const bool vbMandatory, const bool vbHandleByCmd);
//
const T &GetValue() const;
// Overrideable:
- public:
- /* dtor */ virtual ~CMICmdArgValBaseTemplate();
+ ~CMICmdArgValBaseTemplate() override = default;
// Attributes:
protected:
@@ -87,17 +87,6 @@ template <class T> class CMICmdArgValBaseTemplate : public CMICmdArgValBase
//++ ------------------------------------------------------------------------------------
// Details: CMICmdArgValBaseTemplate constructor.
// Type: Method.
-// Args: None.
-// Return: None.
-// Throws: None.
-//--
-template <class T> CMICmdArgValBaseTemplate<T>::CMICmdArgValBaseTemplate()
-{
-}
-
-//++ ------------------------------------------------------------------------------------
-// Details: CMICmdArgValBaseTemplate constructor.
-// Type: Method.
// Args: vrArgName - (R) Argument's name to search by.
// vbMandatory - (R) True = Yes must be present, false = optional argument.
// vbHandleByCmd - (R) True = Command processes *this option, false = not handled.
@@ -111,17 +100,6 @@ CMICmdArgValBaseTemplate<T>::CMICmdArgValBaseTemplate(const CMIUtilString &vrArg
}
//++ ------------------------------------------------------------------------------------
-// Details: CMICmdArgValBaseTemplate destructor.
-// Type: Overrideable.
-// Args: None.
-// Return: None.
-// Throws: None.
-//--
-template <class T> CMICmdArgValBaseTemplate<T>::~CMICmdArgValBaseTemplate()
-{
-}
-
-//++ ------------------------------------------------------------------------------------
// Details: Retrieve the value the argument parsed from the command's argument / options
// text string.
// Type: Method.
diff --git a/lldb/tools/lldb-mi/MICmdBase.h b/lldb/tools/lldb-mi/MICmdBase.h
index 492577a043c..b072311f0bd 100644
--- a/lldb/tools/lldb-mi/MICmdBase.h
+++ b/lldb/tools/lldb-mi/MICmdBase.h
@@ -9,7 +9,10 @@
#pragma once
-// In-house headers:
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
#include "MIUtilString.h"
#include "MICmnBase.h"
#include "MICmnResources.h"
@@ -47,29 +50,27 @@ class CMICmdBase : public CMICmnBase, public CMICmdInvoker::ICmd, public CMICmdF
{
// Methods:
public:
- /* ctor */ CMICmdBase();
+ CMICmdBase();
// Overridden:
- public:
// From CMICmdInvoker::ICmd
- virtual const SMICmdData &GetCmdData() const;
- virtual const CMIUtilString &GetErrorDescription() const;
- virtual void SetCmdData(const SMICmdData &vCmdData);
- virtual void CmdFinishedTellInvoker() const;
- virtual const CMIUtilString &GetMIResultRecord() const;
- virtual const CMIUtilString &GetMIResultRecordExtra() const;
- virtual bool HasMIResultRecordExtra() const;
- virtual bool ParseArgs();
+ const SMICmdData &GetCmdData() const override;
+ const CMIUtilString &GetErrorDescription() const override;
+ void SetCmdData(const SMICmdData &vCmdData) override;
+ void CmdFinishedTellInvoker() const override;
+ const CMIUtilString &GetMIResultRecord() const override;
+ const CMIUtilString &GetMIResultRecordExtra() const override;
+ bool HasMIResultRecordExtra() const override;
+ bool ParseArgs() override;
// From CMICmdFactory::ICmd
- virtual const CMIUtilString &GetMiCmd() const;
- virtual CMICmdFactory::CmdCreatorFnPtr GetCmdCreatorFn() const;
+ const CMIUtilString &GetMiCmd() const override;
+ CMICmdFactory::CmdCreatorFnPtr GetCmdCreatorFn() const override;
virtual MIuint GetGUID();
void AddCommonArgs();
// Overrideable:
- public:
- /* dtor */ virtual ~CMICmdBase();
+ ~CMICmdBase() override;
virtual bool GetExitAppOnCommandFailure() const;
// Methods:
@@ -79,7 +80,6 @@ class CMICmdBase : public CMICmnBase, public CMICmdInvoker::ICmd, public CMICmdF
bool ParseValidateCmdOptions();
// Attributes:
- protected:
CMICmdFactory::CmdCreatorFnPtr m_pSelfCreatorFn;
CMIUtilString m_strCurrentErrDescription; // Reason for Execute or Acknowledge function failure
SMICmdData m_cmdData; // Holds information/status of *this command. Used by other MI code to report or determine state of a command.
@@ -116,7 +116,7 @@ class CMICmdBase : public CMICmnBase, public CMICmdInvoker::ICmd, public CMICmdF
// Args: vStrOptionName - (R) The text name of the argument or option to search for in
// the list of the command's possible arguments or options.
// Return: T * - CMICmdArgValBase derived object.
-// - NULL = function has failed, unable to retrieve the option/arg object.
+// - nullptr = function has failed, unable to retrieve the option/arg object.
// Throws: None.
//--
template <class T>
@@ -143,7 +143,7 @@ CMICmdBase::GetOption(const CMIUtilString &vStrOptionName)
// c - (R) The text name of the argument or option to search for in the list of
// the command's possible arguments or options.
// Return: T * - CMICmdArgValBase derived object.
-// - NULL = function has failed, unable to retrieve the option/arg object.
+// - nullptr = function has failed, unable to retrieve the option/arg object.
// Throws: None.
//--
#define CMICMDBASE_GETOPTION(a, b, c) \
OpenPOWER on IntegriCloud