Changes to Python commands:

 - They now have an SBCommandReturnObject instead of an SBStream as third argument
 - The class CommandObjectPythonFunction has been merged into CommandObjectCommands.cpp
 - The command to manage them is now:
  command script with subcommands add, list, delete, clear
   command alias is returned to its previous functionality
 - Python commands are now part of an user dictionary, instead of being seen as aliases
 

llvm-svn: 137785

1 files changed, 3 insertions, 3 deletions

diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
index e0a88cbc338..4db56d4ac23 100644
--- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
@@ -1909,7 +1909,7 @@ ScriptInterpreterPython::CastPyObjectToSBValue (void* data)
 bool
 ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function,
                                                const char* args,
-                                               lldb::SBStream& stream,
+                                               lldb_private::CommandReturnObject& cmd_retobj,
                                                Error& error)
 {
     if (!impl_function)
@@ -1941,7 +1941,7 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function,
                                              debugger_sp,
                                              args,
                                              err_msg,
-                                             stream);
+                                             cmd_retobj);
         python_interpreter->LeaveSession ();
     }
     else
@@ -1955,7 +1955,7 @@ ScriptInterpreterPython::RunScriptBasedCommand(const char* impl_function,
                                              debugger_sp,
                                              args,
                                              err_msg,
-                                             stream);
+                                             cmd_retobj);
         python_interpreter->LeaveSession ();
         ReleasePythonLock ();
     }