*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

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

1 files changed, 64 insertions, 83 deletions

diff --git a/lldb/source/Commands/CommandObjectExpression.h b/lldb/source/Commands/CommandObjectExpression.h
index 9e6278351d1..5b8173f9dea 100644
--- a/lldb/source/Commands/CommandObjectExpression.h
+++ b/lldb/source/Commands/CommandObjectExpression.h
@@ -14,101 +14,82 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb/lldb-private-enumerations.h"
 #include "lldb/Core/IOHandler.h"
 #include "lldb/Interpreter/CommandObject.h"
 #include "lldb/Interpreter/OptionGroupBoolean.h"
 #include "lldb/Interpreter/OptionGroupFormat.h"
 #include "lldb/Interpreter/OptionGroupValueObjectDisplay.h"
 #include "lldb/Target/ExecutionContext.h"
+#include "lldb/lldb-private-enumerations.h"
 namespace lldb_private {
 
-class CommandObjectExpression :
-    public CommandObjectRaw,
-    public IOHandlerDelegate
-{
+class CommandObjectExpression : public CommandObjectRaw,
+                                public IOHandlerDelegate {
 public:
+  class CommandOptions : public OptionGroup {
+  public:
+    CommandOptions();
+
+    ~CommandOptions() override;
+
+    uint32_t GetNumDefinitions() override;
+
+    const OptionDefinition *GetDefinitions() override;
+
+    Error SetOptionValue(uint32_t option_idx, const char *option_value,
+                         ExecutionContext *execution_context) override;
+
+    void OptionParsingStarting(ExecutionContext *execution_context) override;
+
+    // Options table: Required for subclasses of Options.
+
+    static OptionDefinition g_option_table[];
+    bool top_level;
+    bool unwind_on_error;
+    bool ignore_breakpoints;
+    bool allow_jit;
+    bool show_types;
+    bool show_summary;
+    bool debug;
+    uint32_t timeout;
+    bool try_all_threads;
+    lldb::LanguageType language;
+    LanguageRuntimeDescriptionDisplayVerbosity m_verbosity;
+    LazyBool auto_apply_fixits;
+  };
+
+  CommandObjectExpression(CommandInterpreter &interpreter);
+
+  ~CommandObjectExpression() override;
 
-    class CommandOptions : public OptionGroup
-    {
-    public:
-
-        CommandOptions ();
-
-        ~CommandOptions() override;
-
-        uint32_t
-        GetNumDefinitions() override;
-        
-        const OptionDefinition*
-        GetDefinitions() override;
-        
-        Error
-        SetOptionValue(uint32_t option_idx,
-                       const char *option_value,
-                       ExecutionContext *execution_context) override;
-        
-        void
-        OptionParsingStarting(ExecutionContext *execution_context) override;
-
-        // Options table: Required for subclasses of Options.
-
-        static OptionDefinition g_option_table[];
-        bool        top_level;
-        bool        unwind_on_error;
-        bool        ignore_breakpoints;
-        bool        allow_jit;
-        bool        show_types;
-        bool        show_summary;
-        bool        debug;
-        uint32_t    timeout;
-        bool        try_all_threads;
-        lldb::LanguageType language;
-        LanguageRuntimeDescriptionDisplayVerbosity m_verbosity;
-        LazyBool        auto_apply_fixits;
-    };
-
-    CommandObjectExpression (CommandInterpreter &interpreter);
-
-    ~CommandObjectExpression() override;
-
-    Options *
-    GetOptions() override;
+  Options *GetOptions() override;
 
 protected:
-    
-    //------------------------------------------------------------------
-    // IOHandler::Delegate functions
-    //------------------------------------------------------------------
-    void
-    IOHandlerInputComplete(IOHandler &io_handler,
-			   std::string &line) override;
-    
-    bool
-    IOHandlerIsInputComplete (IOHandler &io_handler,
-                              StringList &lines) override;
-    
-    bool
-    DoExecute(const char *command,
-	      CommandReturnObject &result) override;
-
-    bool
-    EvaluateExpression (const char *expr,
-                        Stream *output_stream,
-                        Stream *error_stream,
-                        CommandReturnObject *result = NULL);
-    
-    void
-    GetMultilineExpression ();
-
-    OptionGroupOptions m_option_group;
-    OptionGroupFormat m_format_options;
-    OptionGroupValueObjectDisplay m_varobj_options;
-    OptionGroupBoolean m_repl_option;
-    CommandOptions m_command_options;
-    uint32_t m_expr_line_count;
-    std::string m_expr_lines; // Multi-line expression support
-    std::string m_fixed_expression;  // Holds the current expression's fixed text.
+  //------------------------------------------------------------------
+  // IOHandler::Delegate functions
+  //------------------------------------------------------------------
+  void IOHandlerInputComplete(IOHandler &io_handler,
+                              std::string &line) override;
+
+  bool IOHandlerIsInputComplete(IOHandler &io_handler,
+                                StringList &lines) override;
+
+  bool DoExecute(const char *command, CommandReturnObject &result) override;
+
+  bool EvaluateExpression(const char *expr, Stream *output_stream,
+                          Stream *error_stream,
+                          CommandReturnObject *result = NULL);
+
+  void GetMultilineExpression();
+
+  OptionGroupOptions m_option_group;
+  OptionGroupFormat m_format_options;
+  OptionGroupValueObjectDisplay m_varobj_options;
+  OptionGroupBoolean m_repl_option;
+  CommandOptions m_command_options;
+  uint32_t m_expr_line_count;
+  std::string m_expr_lines;       // Multi-line expression support
+  std::string m_fixed_expression; // Holds the current expression's fixed text.
 };
 
 } // namespace lldb_private