Replace uses of MIUtilParse::CRegexParser with llvm::Regex

[mgorny]

Summary

Replace uses of the local MIUtilParse::CRegexParser class with the LLVM support class llvm::Regex. This reduces duplication of code, and makes it possible to remove the MIUtilParse::CRegexParser class that requires LLVM internal implementation headers.

Bug: https://llvm.org/bugs/show_bug.cgi?id=29138

Note: I don't have commit access

[labath]

Woohoo. I am glad that this is finally getting fixed.

[ki.stfu]

lgtm if tests are passed

[mgorny]

In D23882#527682, @ki.stfu wrote:

lgtm if tests are passed

I can't say tests pass for me right now, but the results (failures, errors and unexpected passes) are the same with and without the patch.

[labath]

Tests run clean when I apply this locally. Do you want me to put that in for you?

[mgorny]

In D23882#534038, @labath wrote:

Tests run clean when I apply this locally. Do you want me to put that in for you?

I'd appreciate that. Thanks a lot!

[labath]

r280662

tools/lldb-mi/MICmdCmdData.cpp

 
 // Third Party Headers:
 #include <inttypes.h> // For PRIx64
 #include "lldb/API/SBCommandInterpreter.h"
 #include "lldb/API/SBThread.h"
 #include "lldb/API/SBInstruction.h"
 #include "lldb/API/SBInstructionList.h"
 #include "lldb/API/SBStream.h"
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/Regex.h"
 
 // In-house headers:
 #include "MICmdCmdData.h"
 #include "MICmnMIResultRecord.h"
 #include "MICmnMIValueConst.h"
 #include "MICmnLLDBDebugger.h"
 #include "MICmnLLDBDebugSessionInfo.h"
 #include "MICmnLLDBProxySBValue.h"
 #include "MICmdArgValNumber.h"
 #include "MICmdArgValString.h"
 #include "MICmdArgValThreadGrp.h"
 #include "MICmdArgValOptionLong.h"
 #include "MICmdArgValOptionShort.h"
 #include "MICmdArgValListOfN.h"
 #include "MICmdArgValConsume.h"
 #include "MICmnLLDBDebugSessionInfoVarObj.h"
 #include "MICmnLLDBUtilSBValue.h"
-#include "MIUtilParse.h"
 
 //++ ------------------------------------------------------------------------------------
 // Details: CMICmdCmdDataEvaluateExpression constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--

 {
     // Note: Ambiguities arise because the column is optional, and
     // because : can appear in filenames or as a byte in a multibyte
     // UTF8 character.  We keep those cases to a minimum by using regex
     // to work on the string from both the left and right, so that what
     // is remains is assumed to be the filename.
 
     // Match LineEntry using regex.
-    static MIUtilParse::CRegexParser g_lineentry_nocol_regex( 
-        "^ *LineEntry: \\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+)$");
-    static MIUtilParse::CRegexParser g_lineentry_col_regex( 
-        "^ *LineEntry: \\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+):[0-9]+$");
-        //                ^1=start         ^2=end               ^3=f ^4=line ^5=:col(opt)
+    static llvm::Regex g_lineentry_nocol_regex(
+        llvm::StringRef("^ *LineEntry: \\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+)$"));
+    static llvm::Regex g_lineentry_col_regex(
+        llvm::StringRef("^ *LineEntry: \\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+):[0-9]+$"));
+        //                                ^1=start         ^2=end               ^3=f ^4=line ^5=:col(opt)
 
-    MIUtilParse::CRegexParser::Match match(6);
+    llvm::SmallVector<llvm::StringRef, 6> match;
 
     // First try matching the LineEntry with the column,
     // then try without the column.
-    const bool ok = g_lineentry_col_regex.Execute(input, match) ||
-                    g_lineentry_nocol_regex.Execute(input, match);
+    const bool ok = g_lineentry_col_regex.match(input, &match) ||
+                    g_lineentry_nocol_regex.match(input, &match);
     if (ok)
     {
-        start = match.GetMatchAtIndex(1);
-        end   = match.GetMatchAtIndex(2);
-        file  = match.GetMatchAtIndex(3);
-        line  = match.GetMatchAtIndex(4);
+        start = match[1];
+        end   = match[2];
+        file  = match[3];
+        line  = match[4];
     }
     return ok;
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: The invoker requires this function. The command prepares a MI Record Result
 //          for the work carried out in the Execute().
 // Type:    Overridden.

tools/lldb-mi/MICmdCmdSymbol.cpp

 //===-- MICmdCmdSymbol.cpp --------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 // Overview:    CMICmdCmdSymbolListLines     implementation.
 
 // Third Party Headers:
 #include "lldb/API/SBCommandInterpreter.h"
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/Regex.h"
 
 // In-house headers:
 #include "MICmdArgValFile.h"
 #include "MICmdCmdSymbol.h"
 #include "MICmnLLDBDebugSessionInfo.h"
 #include "MICmnMIResultRecord.h"
 #include "MICmnMIValueList.h"
 #include "MICmnMIValueTuple.h"
-#include "MIUtilParse.h"
 
 //++ ------------------------------------------------------------------------------------
 // Details: CMICmdCmdSymbolListLines constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--

 //          file  - (W) String representing the file.
 // Return:  bool - True = input was parsed successfully, false = input could not be parsed.
 // Throws:  None.
 //--
 static bool
 ParseLLDBLineAddressHeader(const char *input, CMIUtilString &file)
 {
     // Match LineEntry using regex.
-    static MIUtilParse::CRegexParser g_lineentry_header_regex( 
-        "^ *Lines found for file (.+) in compilation unit (.+) in `(.+)$");
-        //                       ^1=file                  ^2=cu    ^3=module
+    static llvm::Regex g_lineentry_header_regex(
+        llvm::StringRef("^ *Lines found for file (.+) in compilation unit (.+) in `(.+)$"));
+        //                                       ^1=file                  ^2=cu    ^3=module
 
-    MIUtilParse::CRegexParser::Match match(4);
+    llvm::SmallVector<llvm::StringRef, 4> match;
 
-    const bool ok = g_lineentry_header_regex.Execute(input, match);
+    const bool ok = g_lineentry_header_regex.match(input, &match);
     if (ok)
-        file = match.GetMatchAtIndex(1);
+        file = match[1];
     return ok;
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: Helper function for parsing a line entry returned from lldb for the command:
 //              target modules dump line-table <file>
 //          where the line entry is of the format:
 //              0x0000000100000e70: /path/to/file:3002[:4]

 {
     // Note: Ambiguities arise because the column is optional, and
     // because : can appear in filenames or as a byte in a multibyte
     // UTF8 character.  We keep those cases to a minimum by using regex
     // to work on the string from both the left and right, so that what
     // is remains is assumed to be the filename.
 
     // Match LineEntry using regex.
-    static MIUtilParse::CRegexParser g_lineentry_nocol_regex( 
-        "^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+)$");
-    static MIUtilParse::CRegexParser g_lineentry_col_regex( 
-        "^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+):[0-9]+$");
-        //     ^1=start         ^2=end               ^3=f ^4=line ^5=:col(opt)
+    static llvm::Regex g_lineentry_nocol_regex(
+        llvm::StringRef("^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+)$"));
+    static llvm::Regex g_lineentry_col_regex(
+        llvm::StringRef("^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+):[0-9]+$"));
+        //                     ^1=start         ^2=end               ^3=f ^4=line ^5=:col(opt)
 
-    MIUtilParse::CRegexParser::Match match(6);
+    llvm::SmallVector<llvm::StringRef, 6> match;
 
     // First try matching the LineEntry with the column,
     // then try without the column.
-    const bool ok = g_lineentry_col_regex.Execute(input, match) ||
-                    g_lineentry_nocol_regex.Execute(input, match);
+    const bool ok = g_lineentry_col_regex.match(input, &match) ||
+                    g_lineentry_nocol_regex.match(input, &match);
     if (ok)
     {
-        addr = match.GetMatchAtIndex(1);
-        file = match.GetMatchAtIndex(3);
-        line = match.GetMatchAtIndex(4);
+        addr = match[1];
+        file = match[3];
+        line = match[4];
     }
     return ok;
 }
 
 //++ ------------------------------------------------------------------------------------
 // Details: The invoker requires this function. The command prepares a MI Record Result
 //          for the work carried out in the Execute().
 // Type:    Overridden.