[lldb/Commands] Make column available through _regexp-break

[JDevlieghere]

Summary

Update _regexp-break to interpret main.c:8:21 as breakpoint set --line 8 --column 21.

[clayborg]

lgtm

lldb/source/Interpreter/CommandInterpreter.cpp

m_command_dict["thread"] =
       CommandObjectSP(new CommandObjectMultiwordThread(*this));
   m_command_dict["type"] = CommandObjectSP(new CommandObjectType(*this));
   m_command_dict["version"] = CommandObjectSP(new CommandObjectVersion(*this));
   m_command_dict["watchpoint"] =
       CommandObjectSP(new CommandObjectMultiwordWatchpoint(*this));
   m_command_dict["language"] =
       CommandObjectSP(new CommandObjectLanguage(*this));
 
+  // clang-format off
   const char *break_regexes[][2] = {
+      {"^(.*[^[:space:]])[[:space:]]*:[[:space:]]*([[:digit:]]+)[[:space:]]*:[[:space:]]*([[:digit:]]+)[[:space:]]*$",
+       "breakpoint set --file '%1' --line %2 --column %3"},
       {"^(.*[^[:space:]])[[:space:]]*:[[:space:]]*([[:digit:]]+)[[:space:]]*$",
        "breakpoint set --file '%1' --line %2"},
       {"^/([^/]+)/$", "breakpoint set --source-pattern-regexp '%1'"},
       {"^([[:digit:]]+)[[:space:]]*$", "breakpoint set --line %1"},
       {"^\\*?(0x[[:xdigit:]]+)[[:space:]]*$", "breakpoint set --address %1"},
       {"^[\"']?([-+]?\\[.*\\])[\"']?[[:space:]]*$",
        "breakpoint set --name '%1'"},
       {"^(-.*)$", "breakpoint set %1"},
       {"^(.*[^[:space:]])`(.*[^[:space:]])[[:space:]]*$",
        "breakpoint set --name '%2' --shlib '%1'"},
       {"^\\&(.*[^[:space:]])[[:space:]]*$",
        "breakpoint set --name '%1' --skip-prologue=0"},
       {"^[\"']?(.*[^[:space:]\"'])[\"']?[[:space:]]*$",
        "breakpoint set --name '%1'"}};
+  // clang-format on
 
   size_t num_regexes = llvm::array_lengthof(break_regexes);
 
   std::unique_ptr<CommandObjectRegexCommand> break_regex_cmd_up(
       new CommandObjectRegexCommand(
           *this, "_regexp-break",
           "Set a breakpoint using one of several shorthand formats.",
           "\n"
+          "_regexp-break <filename>:<linenum>:<colnum>\n"
+          "              main.c:12:21          // Break at line 12 and column "
+          "21 of main.c\n\n"
           "_regexp-break <filename>:<linenum>\n"
           "              main.c:12             // Break at line 12 of "
           "main.c\n\n"
           "_regexp-break <linenum>\n"
           "              12                    // Break at line 12 of current "
           "file\n\n"
           "_regexp-break 0x<address>\n"
           "              0x1234000             // Break at address "
           "0x1234000\n\n"
           "_regexp-break <name>\n"
           "              main                  // Break in 'main' after the "
           "prologue\n\n"
           "_regexp-break &<name>\n"
           "              &main                 // Break at first instruction "
           "in 'main'\n\n"
           "_regexp-break <module>`<name>\n"
           "              libc.so`malloc        // Break in 'malloc' from "
           "'libc.so'\n\n"
           "_regexp-break /<source-regex>/\n"
           "              /break here/          // Break on source lines in "
           "current file\n"
           "                                    // containing text 'break "
           "here'.\n",
-          2,
+          3,
           CommandCompletions::eSymbolCompletion |
               CommandCompletions::eSourceFileCompletion,
           false));
 
   if (break_regex_cmd_up) {
     bool success = true;
     for (size_t i = 0; i < num_regexes; i++) {
       success = break_regex_cmd_up->AddRegexCommand(break_regexes[i][0],
if (break_regex_cmd_up) {
     }
   }
 
   std::unique_ptr<CommandObjectRegexCommand> tbreak_regex_cmd_up(
       new CommandObjectRegexCommand(
           *this, "_regexp-tbreak",
           "Set a one-shot breakpoint using one of several shorthand formats.",
           "\n"
+          "_regexp-break <filename>:<linenum>:<colnum>\n"
+          "              main.c:12:21          // Break at line 12 and column "
+          "21 of main.c\n\n"
           "_regexp-break <filename>:<linenum>\n"
           "              main.c:12             // Break at line 12 of "
           "main.c\n\n"
           "_regexp-break <linenum>\n"
           "              12                    // Break at line 12 of current "
           "file\n\n"
           "_regexp-break 0x<address>\n"
           "              0x1234000             // Break at address "

lldb/test/Shell/Commands/command-breakpoint-col.test

 # UNSUPPORTED: system-windows
 #
 # RUN: %clang_host -g -O0 %S/Inputs/main.c -o %t.out
-# RUN: %lldb -b -o 'help breakpoint set' -o 'breakpoint set -f main.c -l 2 -u 21' %t.out | FileCheck %s
-# CHECK: -u <column> ( --column <column> )
-# CHECK: Specifies the column number on which to set this breakpoint.
+# RUN: %lldb -b -o 'help breakpoint set' -o 'breakpoint set -f main.c -l 2 -u 21' %t.out | FileCheck %s --check-prefix HELP --check-prefix CHECK
+# RUN: %lldb -b -o 'help _regexp-break' -o 'b main.c:2:21' %t.out | FileCheck %s --check-prefix HELP-REGEX --check-prefix CHECK
+# HELP: -u <column> ( --column <column> )
+# HELP: Specifies the column number on which to set this breakpoint.
+# HELP-REGEX: _regexp-break <filename>:<linenum>:<colnum>
+# HELP-REGEX: main.c:12:21{{.*}}Break at line 12 and column 21 of main.c
 # CHECK: at main.c:2:21