[llvm-branch-commits] [lldb] r200026 - Remove the prompt_delimiter hack as it is no longer needed and wasn't a good addition to the public API.
Greg Clayton
gclayton at apple.com
Fri Jan 24 10:48:11 PST 2014
Author: gclayton
Date: Fri Jan 24 12:48:11 2014
New Revision: 200026
URL: http://llvm.org/viewvc/llvm-project?rev=200026&view=rev
Log:
Remove the prompt_delimiter hack as it is no longer needed and wasn't a good addition to the public API.
Modified:
lldb/branches/iohandler/include/lldb/API/SBDebugger.h
lldb/branches/iohandler/include/lldb/Interpreter/CommandInterpreter.h
lldb/branches/iohandler/scripts/Python/interface/SBDebugger.i
lldb/branches/iohandler/source/API/SBDebugger.cpp
lldb/branches/iohandler/source/Core/IOHandler.cpp
lldb/branches/iohandler/source/Interpreter/CommandInterpreter.cpp
lldb/branches/iohandler/tools/driver/Driver.cpp
Modified: lldb/branches/iohandler/include/lldb/API/SBDebugger.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/include/lldb/API/SBDebugger.h?rev=200026&r1=200025&r2=200026&view=diff
==============================================================================
--- lldb/branches/iohandler/include/lldb/API/SBDebugger.h (original)
+++ lldb/branches/iohandler/include/lldb/API/SBDebugger.h Fri Jan 24 12:48:11 2014
@@ -319,8 +319,7 @@ public:
void
RunCommandInterpreter (bool auto_handle_events,
- bool spawn_thread,
- char prompt_delimiter);
+ bool spawn_thread);
private:
Modified: lldb/branches/iohandler/include/lldb/Interpreter/CommandInterpreter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/include/lldb/Interpreter/CommandInterpreter.h?rev=200026&r1=200025&r2=200026&view=diff
==============================================================================
--- lldb/branches/iohandler/include/lldb/Interpreter/CommandInterpreter.h (original)
+++ lldb/branches/iohandler/include/lldb/Interpreter/CommandInterpreter.h Fri Jan 24 12:48:11 2014
@@ -439,8 +439,7 @@ public:
void
RunCommandInterpreter (bool auto_handle_events,
- bool spawn_thread,
- char prompt_delimiter);
+ bool spawn_thread);
void
GetLLDBCommandsFromIOHandler (const char *prompt,
@@ -466,12 +465,6 @@ public:
bool
GetStopCmdSourceOnError () const;
- char
- GetPromptDelimiterChar () const
- {
- return m_prompt_delimiter_char;
- }
-
protected:
friend class Debugger;
@@ -519,7 +512,6 @@ private:
std::unique_ptr<ScriptInterpreter> m_script_interpreter_ap;
lldb::IOHandlerSP m_command_io_handler_sp;
char m_comment_char;
- char m_prompt_delimiter_char; // If set to a non-NULL character, all prompts should be emitted as %c%s%c where both %c's are this character and the '%s' is the prompt
bool m_batch_command_mode;
ChildrenTruncatedWarningStatus m_truncation_warning; // Whether we truncated children and whether the user has been told
uint32_t m_command_source_depth;
Modified: lldb/branches/iohandler/scripts/Python/interface/SBDebugger.i
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/scripts/Python/interface/SBDebugger.i?rev=200026&r1=200025&r2=200026&view=diff
==============================================================================
--- lldb/branches/iohandler/scripts/Python/interface/SBDebugger.i (original)
+++ lldb/branches/iohandler/scripts/Python/interface/SBDebugger.i Fri Jan 24 12:48:11 2014
@@ -366,8 +366,7 @@ public:
void
RunCommandInterpreter (bool auto_handle_events,
- bool spawn_thread,
- char prompt_delimiter);
+ bool spawn_thread);
}; // class SBDebugger
Modified: lldb/branches/iohandler/source/API/SBDebugger.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/source/API/SBDebugger.cpp?rev=200026&r1=200025&r2=200026&view=diff
==============================================================================
--- lldb/branches/iohandler/source/API/SBDebugger.cpp (original)
+++ lldb/branches/iohandler/source/API/SBDebugger.cpp Fri Jan 24 12:48:11 2014
@@ -955,11 +955,10 @@ SBDebugger::PushInputReader (SBInputRead
void
SBDebugger::RunCommandInterpreter (bool auto_handle_events,
- bool spawn_thread,
- char prompt_delimiter)
+ bool spawn_thread)
{
if (m_opaque_sp)
- m_opaque_sp->GetCommandInterpreter().RunCommandInterpreter(auto_handle_events, spawn_thread, prompt_delimiter);
+ m_opaque_sp->GetCommandInterpreter().RunCommandInterpreter(auto_handle_events, spawn_thread);
}
void
Modified: lldb/branches/iohandler/source/Core/IOHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/source/Core/IOHandler.cpp?rev=200026&r1=200025&r2=200026&view=diff
==============================================================================
--- lldb/branches/iohandler/source/Core/IOHandler.cpp (original)
+++ lldb/branches/iohandler/source/Core/IOHandler.cpp Fri Jan 24 12:48:11 2014
@@ -469,18 +469,8 @@ IOHandlerEditline::GetPrompt ()
bool
IOHandlerEditline::SetPrompt (const char *p)
{
- const char prompt_delimiter_char = m_debugger.GetCommandInterpreter().GetPromptDelimiterChar();
if (p && p[0])
- {
- if (prompt_delimiter_char)
- {
- m_prompt.assign(1, prompt_delimiter_char);
- m_prompt.append(p);
- m_prompt.append(1, prompt_delimiter_char);
- }
- else
- m_prompt = p;
- }
+ m_prompt = p;
else
m_prompt.clear();
if (m_editline_ap)
Modified: lldb/branches/iohandler/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/source/Interpreter/CommandInterpreter.cpp?rev=200026&r1=200025&r2=200026&view=diff
==============================================================================
--- lldb/branches/iohandler/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/branches/iohandler/source/Interpreter/CommandInterpreter.cpp Fri Jan 24 12:48:11 2014
@@ -109,7 +109,6 @@ CommandInterpreter::CommandInterpreter
m_script_interpreter_ap (),
m_command_io_handler_sp (),
m_comment_char ('#'),
- m_prompt_delimiter_char ('\0'),
m_batch_command_mode (false),
m_truncation_warning(eNoTruncation),
m_command_source_depth (0)
@@ -2977,10 +2976,8 @@ CommandInterpreter::IsActive ()
void
CommandInterpreter::RunCommandInterpreter(bool auto_handle_events,
- bool spawn_thread,
- char prompt_delimiter)
+ bool spawn_thread)
{
- m_prompt_delimiter_char = prompt_delimiter;
const bool multiple_lines = false; // Only get one line at a time
if (!m_command_io_handler_sp)
m_command_io_handler_sp.reset(new IOHandlerEditline (m_debugger,
Modified: lldb/branches/iohandler/tools/driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/tools/driver/Driver.cpp?rev=200026&r1=200025&r2=200026&view=diff
==============================================================================
--- lldb/branches/iohandler/tools/driver/Driver.cpp (original)
+++ lldb/branches/iohandler/tools/driver/Driver.cpp Fri Jan 24 12:48:11 2014
@@ -943,8 +943,7 @@ Driver::MainLoop ()
bool handle_events = true;
bool spawn_thread = false;
- char prompt_delimiter = '\0';
- m_debugger.RunCommandInterpreter(handle_events, spawn_thread, prompt_delimiter);
+ m_debugger.RunCommandInterpreter(handle_events, spawn_thread);
reset_stdin_termios();
fclose (stdin);
More information about the llvm-branch-commits
mailing list