Fix parsing expressions to evaluate with spaces and optional args (MI)

[ki.stfu]

Summary

When extracting options for long options (starting with --), the use of
MIUtilString::SplitConsiderQuotes to split all the arguments was being
conditioned on the option type to be expected. This was wrong as this caused
other options to be parsed incorrectly since it was not taking into account the
presence of quotes.

Patch by Ed Munoz <[e-mail]>

[edmunoz]

tools/lldb-mi/MICmdArgValOptionLong.cpp

190

We could use the size of vrwTxt.GetArgs() to reduce the number of calls to CMIUtilString::SplitConsiderQuotes in CMICmdArgContext.

I left it using the more expressive method name, but I'm open to changing it.

[ki.stfu]

lgtm

@edmunoz, good job. Thank you! Would you like me to commit?

[edmunoz]

In D24202#539629, @ki.stfu wrote:

lgtm

@edmunoz, good job. Thank you! Would you like me to commit?

Thanks! Yes, go ahead.

[ki.stfu]

Rebase againt ToT; Apply clang-format & autopep; Minor fix in condition

[ki.stfu]

tools/lldb-mi/MICmdArgValOptionLong.cpp

186–192

@edmunoz: I did it as you suggested.

packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py

def test_lldbmi_eval(self):
         self.runCmd("-var-evaluate-expression var6")
         self.expect("\^done,value=\"0x[0-9a-f]+ \\\\\\\".*?%s\\\\\\\"\"" % self.myexe)
         self.runCmd("-var-show-attributes var6")
         self.expect("\^done,status=\"editable\"")
         self.runCmd("-var-list-children --all-values var6")
         # FIXME: The name below is not correct. It should be "var.*argv[0]".
         self.expect("\^done,numchild=\"1\",children=\[child=\{name=\"var6\.\*\$[0-9]+\",exp=\"\*\$[0-9]+\",numchild=\"0\",type=\"const char\",thread-id=\"4294967295\",value=\"47 '/'\",has_more=\"0\"\}\],has_more=\"0\"") #FIXME -var-list-children shows invalid thread-id
 
+        # Print an expression with spaces and optional arguments
+        self.runCmd("-data-evaluate-expression \"a + b\"")
+        self.expect("\^done,value=\"12\"")
+        self.runCmd("-var-create var7 * \"a + b\" --thread 1 --frame 0")
+        self.expect("\^done,name=\"var7\",numchild=\"0\",value=\"12\",type=\"int\",thread-id=\"1\",has_more=\"0\"")
+
     @skipIfWindows #llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfLinux # llvm.org/pr22841: lldb-mi tests fail on all Linux buildbots
     def test_lldbmi_var_update(self):
         """Test that 'lldb-mi --interpreter' works for -var-update."""
 
         self.spawnLldbMi(args = None)
 

tools/lldb-mi/MICmdArgValOptionLong.cpp

 //          CMICmdArgValListBase::m_eArgType forming argument objects for each of those
 //          options extracted.
 // Type:    Method.
 // Args:    vrwTxt      - (RW)  The command's argument options string.
 //          nArgIndex   - (R)   The Nth arg position in argument context from the left.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
 bool
 CMICmdArgValOptionLong::ExtractExpectedOptions(CMICmdArgContext &vrwTxt, const MIuint nArgIndex)
 {
-    CMIUtilString::VecString_t vecOptions;
-    MIuint nOptionsPresent = 0;
-    if ((m_eExpectingOptionType != eArgValType_StringQuoted) && (m_eExpectingOptionType != eArgValType_StringQuotedNumber) &&
-        (m_eExpectingOptionType != eArgValType_StringQuotedNumberPath))
-        nOptionsPresent = vrwTxt.GetArgsLeftToParse().Split(" ", vecOptions);
-    else
-        nOptionsPresent = vrwTxt.GetArgsLeftToParse().SplitConsiderQuotes(" ", vecOptions);
-    if (nOptionsPresent == 0)
+    if (vrwTxt.GetNumberArgsPresent() == 0)
         return MIstatus::failure;
+    CMIUtilString::VecString_t vecOptions = vrwTxt.GetArgs();
 
     MIuint nArgIndexCnt = 0;
     MIuint nTypeCnt = 0;
     MIuint nTypeCnt2 = 0;
     MIuint nFoundNOptionsCnt = 0;
     CMIUtilString::VecString_t::const_iterator it = vecOptions.begin();
     while (it != vecOptions.end())
     {