intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-31 16:05:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[lldb] Compute fully qualified command names in FindCommandsForApropos"

Browse Source 
This reverts commit b3bfd595a5.
This commit is contained in:
Dave Lee
2022-01-06 20:15:19 -08:00
parent b3bfd595a5
commit bd23dffc2c
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Interpreter/CommandInterpreter.h
View File

@@ -649,7 +649,7 @@ private:
void FindCommandsForApropos(llvm::StringRef word, StringList &commands_found,
StringList &commands_help,
const CommandObject::CommandMap &command_map);
CommandObject::CommandMap &command_map);
// An interruptible wrapper around the stream output
void PrintCommandOutput(Stream &stream, llvm::StringRef str);

25
lldb/source/Interpreter/CommandInterpreter.cpp
View File

@@ -2841,10 +2841,12 @@ void CommandInterpreter::OutputHelpText(Stream &strm, llvm::StringRef word_text,
void CommandInterpreter::FindCommandsForApropos(
llvm::StringRef search_word, StringList &commands_found,
StringList &commands_help, const CommandObject::CommandMap &command_map) {
for (const auto &pair : command_map) {
llvm::StringRef command_name = pair.first;
CommandObject *cmd_obj = pair.second.get();
StringList &commands_help, CommandObject::CommandMap &command_map) {
CommandObject::CommandMap::const_iterator pos;
for (pos = command_map.begin(); pos != command_map.end(); ++pos) {
llvm::StringRef command_name = pos->first;
CommandObject *cmd_obj = pos->second.get();
const bool search_short_help = true;
const bool search_long_help = false;
@@ -2854,19 +2856,14 @@ void CommandInterpreter::FindCommandsForApropos(
cmd_obj->HelpTextContainsWord(search_word, search_short_help,
search_long_help, search_syntax,
search_options)) {
commands_found.AppendString(command_name);
commands_found.AppendString(cmd_obj->GetCommandName());
commands_help.AppendString(cmd_obj->GetHelp());
}
if (auto *multiword_cmd = cmd_obj->GetAsMultiwordCommand()) {
StringList subcommands_found;
FindCommandsForApropos(search_word, subcommands_found, commands_help,
multiword_cmd->GetSubcommandDictionary());
for (const auto &subcommand_name : subcommands_found) {
std::string qualified_name =
(command_name + " " + subcommand_name).str();
commands_found.AppendString(qualified_name);
}
if (cmd_obj->IsMultiwordObject()) {
CommandObjectMultiword *cmd_multiword = cmd_obj->GetAsMultiwordCommand();
FindCommandsForApropos(search_word, commands_found, commands_help,
cmd_multiword->GetSubcommandDictionary());
}
}
}