1 files changed, 63 insertions, 94 deletions
diff --git a/source/Commands/CommandObjectHelp.h b/source/Commands/CommandObjectHelp.h
index a374a10e3e7d..721917a16852 100644
--- a/source/Commands/CommandObjectHelp.h
+++ b/source/Commands/CommandObjectHelp.h
@@ -23,105 +23,74 @@ namespace lldb_private {
 // CommandObjectHelp
 //-------------------------------------------------------------------------
 
-class CommandObjectHelp : public CommandObjectParsed
-{
+class CommandObjectHelp : public CommandObjectParsed {
 public:
+  CommandObjectHelp(CommandInterpreter &interpreter);
 
-    CommandObjectHelp (CommandInterpreter &interpreter);
-
-    ~CommandObjectHelp() override;
-
-    int
-    HandleCompletion(Args &input,
-		     int &cursor_index,
-		     int &cursor_char_position,
-		     int match_start_point,
-		     int max_return_elements,
-		     bool &word_complete,
-		     StringList &matches) override;
-    
-    static void
-    GenerateAdditionalHelpAvenuesMessage (Stream *s,
-                                          const char* command,
-                                          const char* prefix = nullptr,
-                                          const char* subcommand = nullptr,
-                                          bool include_apropos = true,
-                                          bool include_type_lookup = true);
-    
-    class CommandOptions : public Options
-    {
-    public:
-        
-        CommandOptions (CommandInterpreter &interpreter) :
-        Options (interpreter)
-        {
-        }
-        
-        ~CommandOptions() override {}
-        
-        Error
-        SetOptionValue(uint32_t option_idx, const char *option_arg) override
-        {
-            Error error;
-            const int short_option = m_getopt_table[option_idx].val;
-            
-            switch (short_option)
-            {
-                case 'a':
-                    m_show_aliases = false;
-                    break;
-                case 'u':
-                    m_show_user_defined = false;
-                    break;
-                case 'h':
-                    m_show_hidden = true;
-                    break;
-                default:
-                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
-                    break;
-            }
-            
-            return error;
-        }
-        
-        void
-        OptionParsingStarting() override
-        {
-            m_show_aliases = true;
-            m_show_user_defined = true;
-            m_show_hidden = false;
-        }
-        
-        const OptionDefinition*
-        GetDefinitions() override
-        {
-            return g_option_table;
-        }
-        
-        // Options table: Required for subclasses of Options.
-        
-        static OptionDefinition g_option_table[];
-        
-        // Instance variables to hold the values for command options.
-        
-        bool m_show_aliases;
-        bool m_show_user_defined;
-        bool m_show_hidden;
-    };
-    
-    Options *
-    GetOptions() override
-    {
-        return &m_options;
+  ~CommandObjectHelp() override;
+
+  int HandleCompletion(Args &input, int &cursor_index,
+                       int &cursor_char_position, int match_start_point,
+                       int max_return_elements, bool &word_complete,
+                       StringList &matches) override;
+
+  static void GenerateAdditionalHelpAvenuesMessage(
+      Stream *s, llvm::StringRef command, llvm::StringRef prefix,
+      llvm::StringRef subcommand, bool include_apropos = true,
+      bool include_type_lookup = true);
+
+  class CommandOptions : public Options {
+  public:
+    CommandOptions() : Options() {}
+
+    ~CommandOptions() override {}
+
+    Error SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg,
+                         ExecutionContext *execution_context) override {
+      Error error;
+      const int short_option = m_getopt_table[option_idx].val;
+
+      switch (short_option) {
+      case 'a':
+        m_show_aliases = false;
+        break;
+      case 'u':
+        m_show_user_defined = false;
+        break;
+      case 'h':
+        m_show_hidden = true;
+        break;
+      default:
+        error.SetErrorStringWithFormat("unrecognized option '%c'",
+                                       short_option);
+        break;
+      }
+
+      return error;
     }
-    
+
+    void OptionParsingStarting(ExecutionContext *execution_context) override {
+      m_show_aliases = true;
+      m_show_user_defined = true;
+      m_show_hidden = false;
+    }
+
+    llvm::ArrayRef<OptionDefinition> GetDefinitions() override;
+
+    // Instance variables to hold the values for command options.
+
+    bool m_show_aliases;
+    bool m_show_user_defined;
+    bool m_show_hidden;
+  };
+
+  Options *GetOptions() override { return &m_options; }
+
 protected:
-    bool
-    DoExecute(Args& command,
-	      CommandReturnObject &result) override;
-    
+  bool DoExecute(Args &command, CommandReturnObject &result) override;
+
 private:
-    CommandOptions m_options;
+  CommandOptions m_options;
 };
 
 } // namespace lldb_private