From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?= =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?= =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?= =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?= =?UTF-8?q?s:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- lldb/source/Commands/CommandObjectHelp.h | 162 +++++++++++++------------------ 1 file changed, 67 insertions(+), 95 deletions(-) (limited to 'lldb/source/Commands/CommandObjectHelp.h') diff --git a/lldb/source/Commands/CommandObjectHelp.h b/lldb/source/Commands/CommandObjectHelp.h index 6114aa1..827eb57 100644 --- a/lldb/source/Commands/CommandObjectHelp.h +++ b/lldb/source/Commands/CommandObjectHelp.h @@ -23,106 +23,78 @@ 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() : - Options() - { - } - - ~CommandOptions() override {} - - Error - SetOptionValue(uint32_t option_idx, const char *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; - } - - 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, 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() : Options() {} + + ~CommandOptions() override {} + + Error SetOptionValue(uint32_t option_idx, const char *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; } - + + 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; } + 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 -- cgit v1.1