Import LLDB as of upstream SVN 241361 (git 612c075f)

1 files changed, 13 insertions, 0 deletions

diff --git a/include/lldb/Interpreter/CommandInterpreter.h b/include/lldb/Interpreter/CommandInterpreter.h
index 20b6ff9..1962050 100644
--- a/include/lldb/Interpreter/CommandInterpreter.h
+++ b/include/lldb/Interpreter/CommandInterpreter.h
@@ -625,6 +625,12 @@ public:
     bool
     GetPromptOnQuit () const;
 
+    void
+    SetPromptOnQuit (bool b);
+
+    void
+    ResolveCommand(const char *command_line, CommandReturnObject &result);
+
     bool
     GetStopCmdSourceOnError () const;
 
@@ -685,6 +691,13 @@ private:
     Error
     PreprocessCommand (std::string &command);
 
+    // Completely resolves aliases and abbreviations, returning a pointer to the
+    // final command object and updating command_line to the fully substituted
+    // and translated command.
+    CommandObject *
+    ResolveCommandImpl(std::string &command_line, CommandReturnObject &result);
+
+
     Debugger &m_debugger;                       // The debugger session that this interpreter is associated with
     ExecutionContextRef m_exe_ctx_ref;          // The current execution context to use when handling commands
     bool m_synchronous_execution;