[lldb-mi] size_t rather than MIuint for arg counts.

[brucem]

Summary

[lldb-mi] size_t rather than MIuint for arg counts.

[ki.stfu]

tools/lldb-mi/MICmdArgContext.cpp

152

but you forgot this fact here.

tools/lldb-mi/MICmdArgContext.h

35

nArgIndex is _const_ size_t

[brucem]

Update per review. Removing const from header where it isn't needed.

[ki.stfu]

Looks good apart a removed const. (the same question in D11052).

[brucem]

I don't think other code within LLDB really uses const scalar parameters and they don't provide much protection against anything. (They don't do anything for the caller and they only provide a minor restriction for the callee.)

Some const were removed in the MIuint to size_t patch as well, but if we decide to keep this, I can sort through and add them back.

The value of these const annotations isn't clear though.

[ki.stfu]

tools/lldb-mi/MICmdArgContext.cpp

146

the same here: (R) means 'readonly' variable. i.e. you will not plan to return anything through that variable.

[ki.stfu]

In D11049#201815, @brucem wrote:

I don't think other code within LLDB really uses const scalar parameters and they don't provide much protection against anything. (They don't do anything for the caller and they only provide a minor restriction for the callee.)

Some const were removed in the MIuint to size_t patch as well, but if we decide to keep this, I can sort through and add them back.

The value of these const annotations isn't clear though.

Ok. I agree about const for scalar and any other types in arguments: we shouldn't use const for variables that are passed by value.

Fix one inline comment and go ahead.

tools/lldb-mi/MICmdArgContext.h

 class CMICmdArgContext
 {
     // Methods:
   public:
     /* ctor */ CMICmdArgContext(void);
     /* ctor */ CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw);
     //
     const CMIUtilString &GetArgsLeftToParse(void) const;
-    MIuint GetNumberArgsPresent(void) const;
+    size_t GetNumberArgsPresent(void) const;
     CMIUtilString::VecString_t GetArgs(void) const;
     bool IsEmpty(void) const;
     bool RemoveArg(const CMIUtilString &vArg);
-    bool RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex);
+    bool RemoveArgAtPos(const CMIUtilString &vArg, const size_t nArgIndex);
     //
     CMICmdArgContext &operator=(const CMICmdArgContext &vOther);
 
     // Overridden:
   public:
     // From CMIUtilString
     /* dtor */ virtual ~CMICmdArgContext(void);
 
     // Attributes:
   private:
     CMIUtilString m_strCmdArgsAndOptions;
 };

tools/lldb-mi/MICmdArgContext.cpp

 
 //++ ------------------------------------------------------------------------------------
 // Details: Remove the argument at the Nth word position along in the context string.
 //          Any space after the argument is removed if applicable. A search is not
 //          performed as there may be more than one vArg with the same 'name' in the
 //          context string.
 // Type:    Method.
 // Args:    vArg        - (R) The name of the argument.
-//          nArgIndex   - (R) The word count position to which to remove the vArg word.
+//          nArgIndex   - The word count position to which to remove the vArg word.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
 bool
-CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex)
+CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex)
 {
-    MIuint nWordIndex = 0;
+    size_t nWordIndex = 0;
     CMIUtilString strBuildContextUp;
     const CMIUtilString::VecString_t vecWords(GetArgs());
     const bool bSpaceRequired(GetNumberArgsPresent() > 2);
 
     CMIUtilString::VecString_t::const_iterator it = vecWords.begin();
     const CMIUtilString::VecString_t::const_iterator itEnd = vecWords.end();
     while (it != itEnd)
     {
CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex)
 
     return MIstatus::success;
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: Retrieve number of arguments or options present in the command's option text.
 // Type:    Method.
 // Args:    None.
-// Return:  MIuint  - 0 to n arguments present.
+// Return:  size_t  - 0 to n arguments present.
 // Throws:  None.
 //--
-MIuint
+size_t
 CMICmdArgContext::GetNumberArgsPresent(void) const
 {
     CMIUtilString::VecString_t vecOptions;
     return m_strCmdArgsAndOptions.SplitConsiderQuotes(" ", vecOptions);
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: Retrieve all the arguments or options remaining in *this context.

tools/lldb-mi/MICmdArgSet.h

public:
     // Methods:
   public:
     /* ctor */ CMICmdArgSet(void);
 
     bool Add(const CMICmdArgValBase &vArg);
     bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const;
     const SetCmdArgs_t &GetArgsThatAreMissing(void) const;
     const SetCmdArgs_t &GetArgsThatInvalid(void) const;
-    MIuint GetCount(void) const;
+    size_t GetCount(void) const;
     bool IsArgContextEmpty(void) const;
     bool IsArgsPresentButNotHandledByCmd(void) const;
     void WarningArgsNotHandledbyCmdLogFile(const CMIUtilString &vrCmdName);
     bool Validate(const CMIUtilString &vStrMiCmd, CMICmdArgContext &vwCmdArgsText);
 
     // Overrideable:
   public:
     /* dtor */ virtual ~CMICmdArgSet(void);

tools/lldb-mi/MICmdArgSet.cpp

 {
     return m_cmdArgContext.IsEmpty();
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: Retrieve the number of arguments that are being used for the command.
 // Type:    Method.
 // Args:    None.
-// Return:  MIuint - Argument count.
+// Return:  size_t - Argument count.
 // Throws:  None.
 //--
-MIuint
+size_t
 CMICmdArgSet::GetCount(void) const
 {
     return m_setCmdArgs.size();
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: Given a set of command argument objects retrieve the argument with the
 //          specified name.