From 223383ed6c77205c84e2061881206e5379f6442f Mon Sep 17 00:00:00 2001 From: Enrico Granata Date: Tue, 16 Aug 2011 23:24:13 +0000 Subject: 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 --- lldb/scripts/Python/interface/SBCommandReturnObject.i | 7 +++++++ lldb/scripts/Python/python-wrapper.swig | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'lldb/scripts/Python') diff --git a/lldb/scripts/Python/interface/SBCommandReturnObject.i b/lldb/scripts/Python/interface/SBCommandReturnObject.i index 48d7bc24554..51d8ca8a77f 100644 --- a/lldb/scripts/Python/interface/SBCommandReturnObject.i +++ b/lldb/scripts/Python/interface/SBCommandReturnObject.i @@ -70,6 +70,13 @@ public: void SetImmediateErrorFile (FILE *fh); + + void + PutCString(const char* string, int len = -1); + + size_t + Printf(const char* format, ...); + }; } // namespace lldb diff --git a/lldb/scripts/Python/python-wrapper.swig b/lldb/scripts/Python/python-wrapper.swig index 0843af126d1..02691047861 100644 --- a/lldb/scripts/Python/python-wrapper.swig +++ b/lldb/scripts/Python/python-wrapper.swig @@ -590,19 +590,21 @@ LLDBSwigPythonCallCommand lldb::DebuggerSP& debugger, const char* args, std::string& err_msg, - lldb::SBStream& stream + lldb_private::CommandReturnObject& cmd_retobj ) { + not_owning_ap auto_cmd_retobj(&cmd_retobj); + bool retval = false; PyObject *DebuggerObj_PyObj = SWIG_NewPointerObj((void *) &debugger, SWIGTYPE_p_lldb__SBDebugger, 0); - PyObject *StreamObj_PyObj = SWIG_NewPointerObj((void *) &stream, SWIGTYPE_p_lldb__SBStream, 0); + PyObject *CmdRetObj_PyObj = SWIG_NewPointerObj((void *) &auto_cmd_retobj, SWIGTYPE_p_lldb__SBCommandReturnObject, 0); if (DebuggerObj_PyObj == NULL) return retval; - if (StreamObj_PyObj == NULL) + if (CmdRetObj_PyObj == NULL) return retval; if (!python_function_name || !session_dictionary_name) @@ -676,7 +678,7 @@ LLDBSwigPythonCallCommand PyTuple_SetItem (pargs, 0, DebuggerObj_PyObj); // This "steals" a reference to DebuggerObj_PyObj PyTuple_SetItem (pargs, 1, PyString_FromString(args)); - PyTuple_SetItem (pargs, 2, StreamObj_PyObj); // This "steals" a reference to StreamObj_PyObj + PyTuple_SetItem (pargs, 2, CmdRetObj_PyObj); // This "steals" a reference to CmdRetObj_PyObj PyTuple_SetItem (pargs, 3, session_dict); // This "steals" a reference to session_dict pvalue = PyObject_CallObject (pfunc, pargs); Py_DECREF (pargs); -- cgit v1.2.3