1 files changed, 49 insertions, 67 deletions
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp
index a4b56409698e..0c0b068c42a3 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp
@@ -17,83 +17,65 @@
 using namespace lldb;
 using namespace lldb_private;
 
-OptionGroupFile::OptionGroupFile (uint32_t usage_mask,
-                                  bool required,
-                                  const char *long_option, 
-                                  int short_option,
-                                  uint32_t completion_type,
-                                  lldb::CommandArgumentType argument_type,
-                                  const char *usage_text) :
-    m_file ()
-{
-    m_option_definition.usage_mask = usage_mask;
-    m_option_definition.required = required;
-    m_option_definition.long_option = long_option;
-    m_option_definition.short_option = short_option;
-    m_option_definition.validator = nullptr;
-    m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
-    m_option_definition.enum_values = nullptr;
-    m_option_definition.completion_type = completion_type;
-    m_option_definition.argument_type = argument_type;
-    m_option_definition.usage_text = usage_text;
+OptionGroupFile::OptionGroupFile(uint32_t usage_mask, bool required,
+                                 const char *long_option, int short_option,
+                                 uint32_t completion_type,
+                                 lldb::CommandArgumentType argument_type,
+                                 const char *usage_text)
+    : m_file() {
+  m_option_definition.usage_mask = usage_mask;
+  m_option_definition.required = required;
+  m_option_definition.long_option = long_option;
+  m_option_definition.short_option = short_option;
+  m_option_definition.validator = nullptr;
+  m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
+  m_option_definition.enum_values = nullptr;
+  m_option_definition.completion_type = completion_type;
+  m_option_definition.argument_type = argument_type;
+  m_option_definition.usage_text = usage_text;
 }
 
-OptionGroupFile::~OptionGroupFile ()
-{
-}
+OptionGroupFile::~OptionGroupFile() {}
 
-Error
-OptionGroupFile::SetOptionValue (CommandInterpreter &interpreter,
-                                 uint32_t option_idx,
-                                 const char *option_arg)
-{
-    Error error (m_file.SetValueFromString (option_arg));
-    return error;
+Error OptionGroupFile::SetOptionValue(uint32_t option_idx,
+                                      llvm::StringRef option_arg,
+                                      ExecutionContext *execution_context) {
+  Error error(m_file.SetValueFromString(option_arg));
+  return error;
 }
 
-void
-OptionGroupFile::OptionParsingStarting (CommandInterpreter &interpreter)
-{
-    m_file.Clear();
+void OptionGroupFile::OptionParsingStarting(
+    ExecutionContext *execution_context) {
+  m_file.Clear();
 }
 
-
-OptionGroupFileList::OptionGroupFileList (uint32_t usage_mask,
-                                          bool required,
-                                          const char *long_option, 
-                                          int short_option,
-                                          uint32_t completion_type,
-                                          lldb::CommandArgumentType argument_type,
-                                          const char *usage_text) :
-    m_file_list ()
-{
-    m_option_definition.usage_mask = usage_mask;
-    m_option_definition.required = required;
-    m_option_definition.long_option = long_option;
-    m_option_definition.short_option = short_option;
-    m_option_definition.validator = nullptr;
-    m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
-    m_option_definition.enum_values = nullptr;
-    m_option_definition.completion_type = completion_type;
-    m_option_definition.argument_type = argument_type;
-    m_option_definition.usage_text = usage_text;
+OptionGroupFileList::OptionGroupFileList(
+    uint32_t usage_mask, bool required, const char *long_option,
+    int short_option, uint32_t completion_type,
+    lldb::CommandArgumentType argument_type, const char *usage_text)
+    : m_file_list() {
+  m_option_definition.usage_mask = usage_mask;
+  m_option_definition.required = required;
+  m_option_definition.long_option = long_option;
+  m_option_definition.short_option = short_option;
+  m_option_definition.validator = nullptr;
+  m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
+  m_option_definition.enum_values = nullptr;
+  m_option_definition.completion_type = completion_type;
+  m_option_definition.argument_type = argument_type;
+  m_option_definition.usage_text = usage_text;
 }
 
-OptionGroupFileList::~OptionGroupFileList ()
-{
-}
+OptionGroupFileList::~OptionGroupFileList() {}
 
-Error
-OptionGroupFileList::SetOptionValue (CommandInterpreter &interpreter,
-                                     uint32_t option_idx,
-                                     const char *option_arg)
-{
-    Error error (m_file_list.SetValueFromString (option_arg));
-    return error;
+Error OptionGroupFileList::SetOptionValue(uint32_t option_idx,
+                                          llvm::StringRef option_value,
+                                          ExecutionContext *execution_context) {
+  Error error(m_file_list.SetValueFromString(option_value));
+  return error;
 }
 
-void
-OptionGroupFileList::OptionParsingStarting (CommandInterpreter &interpreter)
-{
-    m_file_list.Clear();
+void OptionGroupFileList::OptionParsingStarting(
+    ExecutionContext *execution_context) {
+  m_file_list.Clear();
 }