From 5a988416736b906931cf6076d38f5b960110ed81 Mon Sep 17 00:00:00 2001
From: Jim Ingham <jingham@apple.com>
Date: Fri, 8 Jun 2012 21:56:10 +0000
Subject: 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
---
 lldb/source/Commands/CommandObjectExpression.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'lldb/source/Commands/CommandObjectExpression.cpp')

diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp
index 33ec52c8a1d..3c04eb35c9f 100644
--- a/lldb/source/Commands/CommandObjectExpression.cpp
+++ b/lldb/source/Commands/CommandObjectExpression.cpp
@@ -134,10 +134,11 @@ CommandObjectExpression::CommandOptions::GetDefinitions ()
 }
 
 CommandObjectExpression::CommandObjectExpression (CommandInterpreter &interpreter) :
-    CommandObject (interpreter,
-                   "expression",
-                   "Evaluate a C/ObjC/C++ expression in the current program context, using variables currently in scope.",
-                   NULL),
+    CommandObjectRaw (interpreter,
+                      "expression",
+                      "Evaluate a C/ObjC/C++ expression in the current program context, using variables currently in scope.",
+                      NULL,
+                      eFlagProcessMustBePaused),
     m_option_group (interpreter),
     m_format_options (eFormatDefault),
     m_command_options (),
@@ -180,18 +181,6 @@ CommandObjectExpression::GetOptions ()
     return &m_option_group;
 }
 
-
-bool
-CommandObjectExpression::Execute
-(
-    Args& command,
-    CommandReturnObject &result
-)
-{
-    return false;
-}
-
-
 size_t
 CommandObjectExpression::MultiLineExpressionCallback
 (
@@ -418,7 +407,7 @@ CommandObjectExpression::EvaluateExpression
 }
 
 bool
-CommandObjectExpression::ExecuteRawCommandString
+CommandObjectExpression::DoExecute
 (
     const char *command,
     CommandReturnObject &result
-- 
cgit v1.2.3