1a6d7ab55d
Summary: We currently allow any completion handler to read and manipulate the list of matches we calculated so far. This leads to a few problems: Firstly, a completion handler's logic can now depend on previously calculated results by another handlers. No completion handler should have such an implicit dependency, but the current API makes it likely that this could happen (or already happens). Especially the fact that some completion handler deleted all previously calculated results can mess things up right now. Secondly, all completion handlers have knowledge about our internal data structures with this API. This makes refactoring this internal data structure much harder than it should be. Especially planned changes like the support of descriptions for completions are currently giant patches because we have to refactor every single completion handler. This patch narrows the contract the CompletionRequest has with the different handlers to: 1. A handler can suggest a completion. 2. A handler can ask how many suggestions we already have. Point 2 obviously means we still have a dependency left between the different handlers, but getting rid of this is too large to just append it to this patch. Otherwise this patch just completely hides the internal StringList to the different handlers. The CompletionRequest API now also ensures that the list of completions is unique and we don't suggest the same value multiple times to the user. This property has been so far only been ensured by the `Option` handler, but is now applied globally. This is part of this patch as the OptionHandler is no longer able to implement this functionality itself. Reviewers: jingham, davide, labath Reviewed By: davide Subscribers: lldb-commits Differential Revision: https://reviews.llvm.org/D49322 llvm-svn: 338151
106 lines
4.2 KiB
C++
106 lines
4.2 KiB
C++
//===-- CommandObjectRegexCommand.cpp ---------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "lldb/Interpreter/CommandObjectRegexCommand.h"
|
|
|
|
// C Includes
|
|
// C++ Includes
|
|
// Other libraries and framework includes
|
|
// Project includes
|
|
#include "lldb/Interpreter/CommandInterpreter.h"
|
|
#include "lldb/Interpreter/CommandReturnObject.h"
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
//----------------------------------------------------------------------
|
|
// CommandObjectRegexCommand constructor
|
|
//----------------------------------------------------------------------
|
|
CommandObjectRegexCommand::CommandObjectRegexCommand(
|
|
CommandInterpreter &interpreter, llvm::StringRef name, llvm::StringRef help,
|
|
llvm::StringRef syntax, uint32_t max_matches, uint32_t completion_type_mask,
|
|
bool is_removable)
|
|
: CommandObjectRaw(interpreter, name, help, syntax),
|
|
m_max_matches(max_matches), m_completion_type_mask(completion_type_mask),
|
|
m_entries(), m_is_removable(is_removable) {}
|
|
|
|
//----------------------------------------------------------------------
|
|
// Destructor
|
|
//----------------------------------------------------------------------
|
|
CommandObjectRegexCommand::~CommandObjectRegexCommand() {}
|
|
|
|
bool CommandObjectRegexCommand::DoExecute(llvm::StringRef command,
|
|
CommandReturnObject &result) {
|
|
EntryCollection::const_iterator pos, end = m_entries.end();
|
|
for (pos = m_entries.begin(); pos != end; ++pos) {
|
|
RegularExpression::Match regex_match(m_max_matches);
|
|
|
|
if (pos->regex.Execute(command, ®ex_match)) {
|
|
std::string new_command(pos->command);
|
|
std::string match_str;
|
|
char percent_var[8];
|
|
size_t idx, percent_var_idx;
|
|
for (uint32_t match_idx = 1; match_idx <= m_max_matches; ++match_idx) {
|
|
if (regex_match.GetMatchAtIndex(command, match_idx, match_str)) {
|
|
const int percent_var_len =
|
|
::snprintf(percent_var, sizeof(percent_var), "%%%u", match_idx);
|
|
for (idx = 0; (percent_var_idx = new_command.find(
|
|
percent_var, idx)) != std::string::npos;) {
|
|
new_command.erase(percent_var_idx, percent_var_len);
|
|
new_command.insert(percent_var_idx, match_str);
|
|
idx += percent_var_idx + match_str.size();
|
|
}
|
|
}
|
|
}
|
|
// Interpret the new command and return this as the result!
|
|
if (m_interpreter.GetExpandRegexAliases())
|
|
result.GetOutputStream().Printf("%s\n", new_command.c_str());
|
|
// Pass in true for "no context switching". The command that called us
|
|
// should have set up the context appropriately, we shouldn't have to
|
|
// redo that.
|
|
return m_interpreter.HandleCommand(
|
|
new_command.c_str(), eLazyBoolCalculate, result, nullptr, true, true);
|
|
}
|
|
}
|
|
result.SetStatus(eReturnStatusFailed);
|
|
if (!GetSyntax().empty())
|
|
result.AppendError(GetSyntax());
|
|
else
|
|
result.GetOutputStream() << "Command contents '" << command
|
|
<< "' failed to match any "
|
|
"regular expression in the '"
|
|
<< m_cmd_name << "' regex ";
|
|
return false;
|
|
}
|
|
|
|
bool CommandObjectRegexCommand::AddRegexCommand(const char *re_cstr,
|
|
const char *command_cstr) {
|
|
m_entries.resize(m_entries.size() + 1);
|
|
// Only add the regular expression if it compiles
|
|
if (m_entries.back().regex.Compile(
|
|
llvm::StringRef::withNullAsEmpty(re_cstr))) {
|
|
m_entries.back().command.assign(command_cstr);
|
|
return true;
|
|
}
|
|
// The regex didn't compile...
|
|
m_entries.pop_back();
|
|
return false;
|
|
}
|
|
|
|
int CommandObjectRegexCommand::HandleCompletion(CompletionRequest &request) {
|
|
if (m_completion_type_mask) {
|
|
CommandCompletions::InvokeCommonCompletionCallbacks(
|
|
GetCommandInterpreter(), m_completion_type_mask, request, nullptr);
|
|
return request.GetNumberOfMatches();
|
|
} else {
|
|
request.SetWordComplete(false);
|
|
}
|
|
return 0;
|
|
}
|