Make raw & parsed commands subclasses of CommandObject rather than having the raw version implement an

Execute which was never going to get run and another ExecuteRawCommandString.  Took the knowledge of how
to prepare raw & parsed commands out of CommandInterpreter and put it in CommandObject where it belongs.

Also took all the cases where there were the subcommands of Multiword commands declared in the .h file for
the overall command and moved them into the .cpp file.

Made the CommandObject flags work for raw as well as parsed commands.

Made "expr" use the flags so that it requires you to be paused to run "expr".

llvm-svn: 158235

1 files changed, 0 insertions, 279 deletions

diff --git a/lldb/source/Commands/CommandObjectWatchpoint.h b/lldb/source/Commands/CommandObjectWatchpoint.h
index e455ac08b3e..cfe6ce2af96 100644
--- a/lldb/source/Commands/CommandObjectWatchpoint.h
+++ b/lldb/source/Commands/CommandObjectWatchpoint.h
@@ -34,285 +34,6 @@ public:
     ~CommandObjectMultiwordWatchpoint ();
 };
 
-//-------------------------------------------------------------------------
-// CommandObjectWatchpointList
-//-------------------------------------------------------------------------
-
-class CommandObjectWatchpointList : public CommandObject
-{
-public:
-    CommandObjectWatchpointList (CommandInterpreter &interpreter);
-
-    virtual
-    ~CommandObjectWatchpointList ();
-
-    virtual bool
-    Execute (Args& command,
-             CommandReturnObject &result);
-
-    virtual Options *
-    GetOptions ();
-
-    class CommandOptions : public Options
-    {
-    public:
-
-        CommandOptions (CommandInterpreter &interpreter);
-
-        virtual
-        ~CommandOptions ();
-
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg);
-
-        void
-        OptionParsingStarting ();
-
-        const OptionDefinition *
-        GetDefinitions ();
-
-        // Options table: Required for subclasses of Options.
-
-        static OptionDefinition g_option_table[];
-
-        // Instance variables to hold the values for command options.
-
-        lldb::DescriptionLevel m_level;
-    };
-
-private:
-    CommandOptions m_options;
-};
-
-//-------------------------------------------------------------------------
-// CommandObjectWatchpointEnable
-//-------------------------------------------------------------------------
-
-class CommandObjectWatchpointEnable : public CommandObject
-{
-public:
-    CommandObjectWatchpointEnable (CommandInterpreter &interpreter);
-
-    virtual
-    ~CommandObjectWatchpointEnable ();
-
-    virtual bool
-    Execute (Args& command,
-             CommandReturnObject &result);
-
-private:
-};
-
-//-------------------------------------------------------------------------
-// CommandObjectWatchpointDisable
-//-------------------------------------------------------------------------
-
-class CommandObjectWatchpointDisable : public CommandObject
-{
-public:
-    CommandObjectWatchpointDisable (CommandInterpreter &interpreter);
-
-    virtual
-    ~CommandObjectWatchpointDisable ();
-
-    virtual bool
-    Execute (Args& command,
-             CommandReturnObject &result);
-
-private:
-};
-
-//-------------------------------------------------------------------------
-// CommandObjectWatchpointDelete
-//-------------------------------------------------------------------------
-
-class CommandObjectWatchpointDelete : public CommandObject
-{
-public:
-    CommandObjectWatchpointDelete (CommandInterpreter &interpreter);
-
-    virtual
-    ~CommandObjectWatchpointDelete ();
-
-    virtual bool
-    Execute (Args& command,
-             CommandReturnObject &result);
-
-private:
-};
-
-//-------------------------------------------------------------------------
-// CommandObjectWatchpointIgnore
-//-------------------------------------------------------------------------
-
-class CommandObjectWatchpointIgnore : public CommandObject
-{
-public:
-    CommandObjectWatchpointIgnore (CommandInterpreter &interpreter);
-
-    virtual
-    ~CommandObjectWatchpointIgnore ();
-
-    virtual bool
-    Execute (Args& command,
-             CommandReturnObject &result);
-
-    virtual Options *
-    GetOptions ();
-
-    class CommandOptions : public Options
-    {
-    public:
-
-        CommandOptions (CommandInterpreter &interpreter);
-
-        virtual
-        ~CommandOptions ();
-
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg);
-
-        void
-        OptionParsingStarting ();
-
-        const OptionDefinition *
-        GetDefinitions ();
-
-        // Options table: Required for subclasses of Options.
-
-        static OptionDefinition g_option_table[];
-
-        // Instance variables to hold the values for command options.
-
-        uint32_t m_ignore_count;
-    };
-
-private:
-    CommandOptions m_options;
-};
-
-//-------------------------------------------------------------------------
-// CommandObjectWatchpointModify
-//-------------------------------------------------------------------------
-
-class CommandObjectWatchpointModify : public CommandObject
-{
-public:
-
-    CommandObjectWatchpointModify (CommandInterpreter &interpreter);
-
-    virtual
-    ~CommandObjectWatchpointModify ();
-
-    virtual bool
-    Execute (Args& command,
-             CommandReturnObject &result);
-
-    virtual Options *
-    GetOptions ();
-
-    class CommandOptions : public Options
-    {
-    public:
-
-        CommandOptions (CommandInterpreter &interpreter);
-
-        virtual
-        ~CommandOptions ();
-
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg);
-
-        void
-        OptionParsingStarting ();
-
-        const OptionDefinition*
-        GetDefinitions ();
-
-        // Options table: Required for subclasses of Options.
-
-        static OptionDefinition g_option_table[];
-
-        // Instance variables to hold the values for command options.
-
-        std::string m_condition;
-        bool m_condition_passed;
-    };
-
-private:
-    CommandOptions m_options;
-};
-
-//-------------------------------------------------------------------------
-// CommandObjectWatchpointSet
-//-------------------------------------------------------------------------
-
-class CommandObjectWatchpointSet : public CommandObjectMultiword
-{
-public:
-
-    CommandObjectWatchpointSet (CommandInterpreter &interpreter);
-
-    virtual
-    ~CommandObjectWatchpointSet ();
-
-
-};
-
-class CommandObjectWatchpointSetVariable : public CommandObject
-{
-public:
-
-    CommandObjectWatchpointSetVariable (CommandInterpreter &interpreter);
-
-    virtual
-    ~CommandObjectWatchpointSetVariable ();
-
-    virtual bool
-    Execute (Args& command,
-             CommandReturnObject &result);
-
-    virtual Options *
-    GetOptions ();
-
-private:
-    OptionGroupOptions m_option_group;
-    OptionGroupWatchpoint m_option_watchpoint;
-};
-
-class CommandObjectWatchpointSetExpression : public CommandObject
-{
-public:
-
-    CommandObjectWatchpointSetExpression (CommandInterpreter &interpreter);
-
-    virtual
-    ~CommandObjectWatchpointSetExpression ();
-
-    virtual bool
-    Execute (Args& command,
-             CommandReturnObject &result)
-    { return false; }
-
-    virtual bool
-    WantsRawCommandString() { return true; }
-
-    // Overrides base class's behavior where WantsCompletion = !WantsRawCommandString.
-    virtual bool
-    WantsCompletion() { return true; }
-
-    virtual bool
-    ExecuteRawCommandString (const char *raw_command,
-                             CommandReturnObject &result);
-
-    virtual Options *
-    GetOptions ();
-
-private:
-    OptionGroupOptions m_option_group;
-    OptionGroupWatchpoint m_option_watchpoint;
-};
-
 } // namespace lldb_private
 
 #endif  // liblldb_CommandObjectWatchpoint_h_