1 files changed, 49 insertions, 93 deletions
diff --git a/include/lldb/Interpreter/OptionGroupFile.h b/include/lldb/Interpreter/OptionGroupFile.h
index 9e35dd43ab7a..93e3ed75d342 100644
--- a/include/lldb/Interpreter/OptionGroupFile.h
+++ b/include/lldb/Interpreter/OptionGroupFile.h
@@ -14,9 +14,9 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Interpreter/Options.h"
 #include "lldb/Interpreter/OptionValueFileSpec.h"
 #include "lldb/Interpreter/OptionValueFileSpecList.h"
+#include "lldb/Interpreter/Options.h"
 
 namespace lldb_private {
 
@@ -24,109 +24,65 @@ namespace lldb_private {
 // OptionGroupFile
 //-------------------------------------------------------------------------
 
-class OptionGroupFile : public OptionGroup
-{
+class OptionGroupFile : public OptionGroup {
 public:
-    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);
-    
-    ~OptionGroupFile() override;
-
-    uint32_t
-    GetNumDefinitions() override
-    {
-        return 1;
-    }
-    
-    const OptionDefinition*
-    GetDefinitions() override
-    {
-        return &m_option_definition;
-    }
-    
-    Error
-    SetOptionValue(CommandInterpreter &interpreter,
-                   uint32_t option_idx,
-                   const char *option_value) override;
-    
-    void
-    OptionParsingStarting(CommandInterpreter &interpreter) override;
-    
-    OptionValueFileSpec &
-    GetOptionValue ()
-    {
-        return m_file;
-    }
-
-    const OptionValueFileSpec &
-    GetOptionValue () const
-    {
-        return m_file;
-    }
+  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);
+
+  ~OptionGroupFile() override;
+
+  llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
+    return llvm::ArrayRef<OptionDefinition>(&m_option_definition, 1);
+  }
+
+  Error SetOptionValue(uint32_t option_idx, llvm::StringRef option_value,
+                       ExecutionContext *execution_context) override;
+  Error SetOptionValue(uint32_t, const char *, ExecutionContext *) = delete;
+
+  void OptionParsingStarting(ExecutionContext *execution_context) override;
+
+  OptionValueFileSpec &GetOptionValue() { return m_file; }
+
+  const OptionValueFileSpec &GetOptionValue() const { return m_file; }
 
 protected:
-    OptionValueFileSpec m_file;
-    OptionDefinition m_option_definition;
+  OptionValueFileSpec m_file;
+  OptionDefinition m_option_definition;
 };
 
 //-------------------------------------------------------------------------
 // OptionGroupFileList
 //-------------------------------------------------------------------------
 
-class OptionGroupFileList : public OptionGroup
-{
+class OptionGroupFileList : public OptionGroup {
 public:
-    
-    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);
-    
-    ~OptionGroupFileList() override;
-    
-    uint32_t
-    GetNumDefinitions() override
-    {
-        return 1;
-    }
-    
-    const OptionDefinition*
-    GetDefinitions() override
-    {
-        return &m_option_definition;
-    }
-    
-    Error
-    SetOptionValue(CommandInterpreter &interpreter,
-                   uint32_t option_idx,
-                   const char *option_value) override;
-    
-    void
-    OptionParsingStarting(CommandInterpreter &interpreter) override;
-
-    OptionValueFileSpecList &
-    GetOptionValue ()
-    {
-        return m_file_list;
-    }
-    
-    const OptionValueFileSpecList &
-    GetOptionValue () const
-    {
-        return m_file_list;
-    }
-    
+  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);
+
+  ~OptionGroupFileList() override;
+
+  llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
+    return llvm::ArrayRef<OptionDefinition>(&m_option_definition, 1);
+  }
+
+  Error SetOptionValue(uint32_t option_idx, llvm::StringRef option_value,
+                       ExecutionContext *execution_context) override;
+  Error SetOptionValue(uint32_t, const char *, ExecutionContext *) = delete;
+
+  void OptionParsingStarting(ExecutionContext *execution_context) override;
+
+  OptionValueFileSpecList &GetOptionValue() { return m_file_list; }
+
+  const OptionValueFileSpecList &GetOptionValue() const { return m_file_list; }
+
 protected:
-    OptionValueFileSpecList m_file_list;
-    OptionDefinition m_option_definition;
+  OptionValueFileSpecList m_file_list;
+  OptionDefinition m_option_definition;
 };
 
 } // namespace lldb_private