Author: Jonas Devlieghere Date: 2024-10-30T20:33:28-07:00 New Revision: 75aaa312ffa9aa044b84bd1b32491937795c110a
URL: https://github.com/llvm/llvm-project/commit/75aaa312ffa9aa044b84bd1b32491937795c110a DIFF: https://github.com/llvm/llvm-project/commit/75aaa312ffa9aa044b84bd1b32491937795c110a.diff LOG: [lldb] Fix formatting and whitespace in ScriptInterpreterPython (NFC) Added: Modified: lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 44fd05150ebc0f..7c2b6517468ff4 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -453,8 +453,9 @@ ScriptInterpreterPythonImpl::ScriptInterpreterPythonImpl(Debugger &debugger) // Reloading modules requires a diff erent syntax in Python 2 and Python 3. // This provides a consistent syntax no matter what version of Python. run_string.Clear(); - run_string.Printf("run_one_line (%s, 'from importlib import reload as reload_module')", - m_dictionary_name.c_str()); + run_string.Printf( + "run_one_line (%s, 'from importlib import reload as reload_module')", + m_dictionary_name.c_str()); PyRun_SimpleString(run_string.GetData()); // WARNING: temporary code that loads Cocoa formatters - this should be done @@ -770,21 +771,19 @@ llvm::Expected<unsigned> ScriptInterpreterPythonImpl::GetMaxPositionalArgumentsForCallable( const llvm::StringRef &callable_name) { if (callable_name.empty()) { - return llvm::createStringError( - llvm::inconvertibleErrorCode(), - "called with empty callable name."); - } - Locker py_lock(this, Locker::AcquireLock | - Locker::InitSession | - Locker::NoSTDIN); - auto dict = PythonModule::MainModule() - .ResolveName<PythonDictionary>(m_dictionary_name); + return llvm::createStringError(llvm::inconvertibleErrorCode(), + "called with empty callable name."); + } + Locker py_lock(this, + Locker::AcquireLock | Locker::InitSession | Locker::NoSTDIN); + auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>( + m_dictionary_name); auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>( callable_name, dict); if (!pfunc.IsAllocated()) { - return llvm::createStringError( - llvm::inconvertibleErrorCode(), - "can't find callable: %s", callable_name.str().c_str()); + return llvm::createStringError(llvm::inconvertibleErrorCode(), + "can't find callable: %s", + callable_name.str().c_str()); } llvm::Expected<PythonCallable::ArgInfo> arg_info = pfunc.GetArgInfo(); if (!arg_info) @@ -1266,8 +1265,7 @@ Status ScriptInterpreterPythonImpl::SetBreakpointCommandCallback( // Set a Python one-liner as the callback for the watchpoint. void ScriptInterpreterPythonImpl::SetWatchpointCommandCallback( - WatchpointOptions *wp_options, const char *user_input, - bool is_callback) { + WatchpointOptions *wp_options, const char *user_input, bool is_callback) { auto data_up = std::make_unique<WatchpointOptions::CommandData>(); // It's necessary to set both user_source and script_source to the oneliner. @@ -1293,8 +1291,7 @@ Status ScriptInterpreterPythonImpl::ExportFunctionDefinitionToInterpreter( std::string function_def_string(function_def.CopyList()); Status error = ExecuteMultipleLines( - function_def_string.c_str(), - ExecuteScriptOptions().SetEnableIO(false)); + function_def_string.c_str(), ExecuteScriptOptions().SetEnableIO(false)); return error; } @@ -2075,7 +2072,8 @@ int ScriptInterpreterPythonImpl::GetIndexOfChildWithName( { Locker py_lock(this, Locker::AcquireLock | Locker::InitSession | Locker::NoSTDIN); - ret_val = SWIGBridge::LLDBSwigPython_GetIndexOfChildWithName(implementor, child_name); + ret_val = SWIGBridge::LLDBSwigPython_GetIndexOfChildWithName(implementor, + child_name); } return ret_val; @@ -2467,7 +2465,8 @@ bool ScriptInterpreterPythonImpl::LoadScriptingModule( // the lifetime of the process in which this LLDB framework is living. const bool does_contain_executed = ExecuteOneLineWithReturn( command_stream.GetData(), - ScriptInterpreterPythonImpl::eScriptReturnTypeBool, &does_contain, exc_options); + ScriptInterpreterPythonImpl::eScriptReturnTypeBool, &does_contain, + exc_options); const bool was_imported_globally = does_contain_executed && does_contain; const bool was_imported_locally = @@ -2684,7 +2683,7 @@ bool ScriptInterpreterPythonImpl::RunScriptBasedParsedCommand( args_arr_sp->AddStringItem(entry.ref()); } StructuredDataImpl args_impl(args_arr_sp); - + ret_val = SWIGBridge::LLDBSwigPythonCallParsedCommandObject( static_cast<PyObject *>(impl_obj_sp->GetValue()), debugger_sp, args_impl, cmd_retobj, exe_ctx_ref_sp); @@ -2786,8 +2785,7 @@ bool ScriptInterpreterPythonImpl::GetDocumentationForItem(const char *item, if (ExecuteOneLineWithReturn( command, ScriptInterpreter::eScriptReturnTypeCharStrOrNone, - &result_ptr, - ExecuteScriptOptions().SetEnableIO(false))) { + &result_ptr, ExecuteScriptOptions().SetEnableIO(false))) { if (result_ptr) dest.assign(result_ptr); return true; @@ -2885,7 +2883,7 @@ uint32_t ScriptInterpreterPythonImpl::GetFlagsForCommandObject( return result; } -StructuredData::ObjectSP +StructuredData::ObjectSP ScriptInterpreterPythonImpl::GetOptionsForCommandObject( StructuredData::GenericSP cmd_obj_sp) { StructuredData::ObjectSP result = {}; @@ -2930,10 +2928,10 @@ ScriptInterpreterPythonImpl::GetOptionsForCommandObject( PyErr_Clear(); return {}; } - return py_return.CreateStructuredObject(); + return py_return.CreateStructuredObject(); } -StructuredData::ObjectSP +StructuredData::ObjectSP ScriptInterpreterPythonImpl::GetArgumentsForCommandObject( StructuredData::GenericSP cmd_obj_sp) { StructuredData::ObjectSP result = {}; @@ -2978,11 +2976,10 @@ ScriptInterpreterPythonImpl::GetArgumentsForCommandObject( PyErr_Clear(); return {}; } - return py_return.CreateStructuredObject(); + return py_return.CreateStructuredObject(); } -void -ScriptInterpreterPythonImpl::OptionParsingStartedForCommandObject( +void ScriptInterpreterPythonImpl::OptionParsingStartedForCommandObject( StructuredData::GenericSP cmd_obj_sp) { Locker py_lock(this, Locker::AcquireLock | Locker::NoSTDIN, Locker::FreeLock); @@ -2990,7 +2987,7 @@ ScriptInterpreterPythonImpl::OptionParsingStartedForCommandObject( static char callee_name[] = "option_parsing_started"; if (!cmd_obj_sp) - return ; + return; PythonObject implementor(PyRefType::Borrowed, (PyObject *)cmd_obj_sp->GetValue()); @@ -3016,10 +3013,9 @@ ScriptInterpreterPythonImpl::OptionParsingStartedForCommandObject( if (PyErr_Occurred()) PyErr_Clear(); - // option_parsing_starting doesn't return anything, ignore anything but + // option_parsing_starting doesn't return anything, ignore anything but // python errors. - unwrapOrSetPythonException( - As<bool>(implementor.CallMethod(callee_name))); + unwrapOrSetPythonException(As<bool>(implementor.CallMethod(callee_name))); // if it fails, print the error but otherwise go on if (PyErr_Occurred()) { @@ -3029,8 +3025,7 @@ ScriptInterpreterPythonImpl::OptionParsingStartedForCommandObject( } } -bool -ScriptInterpreterPythonImpl::SetOptionValueForCommandObject( +bool ScriptInterpreterPythonImpl::SetOptionValueForCommandObject( StructuredData::GenericSP cmd_obj_sp, ExecutionContext *exe_ctx, llvm::StringRef long_option, llvm::StringRef value) { StructuredData::ObjectSP result = {}; @@ -3065,15 +3060,15 @@ ScriptInterpreterPythonImpl::SetOptionValueForCommandObject( if (PyErr_Occurred()) PyErr_Clear(); - + lldb::ExecutionContextRefSP exe_ctx_ref_sp; if (exe_ctx) exe_ctx_ref_sp.reset(new ExecutionContextRef(exe_ctx)); PythonObject ctx_ref_obj = SWIGBridge::ToSWIGWrapper(exe_ctx_ref_sp); - - bool py_return = unwrapOrSetPythonException( - As<bool>(implementor.CallMethod(callee_name, ctx_ref_obj, long_option.str().c_str(), - value.str().c_str()))); + + bool py_return = unwrapOrSetPythonException(As<bool>( + implementor.CallMethod(callee_name, ctx_ref_obj, + long_option.str().c_str(), value.str().c_str()))); // if it fails, print the error but otherwise go on if (PyErr_Occurred()) { _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
