diff options
4 files changed, 22 insertions, 22 deletions
diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp index de725a65046..f047555bce7 100644 --- a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp +++ b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp @@ -520,13 +520,13 @@ CommandObjectBreakpointCommandAdd::GenerateBreakpointCommandCallback //------------------------------------------------------------------------- -// CommandObjectBreakpointCommandRemove +// CommandObjectBreakpointCommandDelete //------------------------------------------------------------------------- -CommandObjectBreakpointCommandRemove::CommandObjectBreakpointCommandRemove (CommandInterpreter &interpreter) : +CommandObjectBreakpointCommandDelete::CommandObjectBreakpointCommandDelete (CommandInterpreter &interpreter) : CommandObject (interpreter, - "remove", - "Remove the set of commands from a breakpoint.", + "delete", + "Delete the set of commands from a breakpoint.", NULL) { CommandArgumentEntry arg; @@ -543,12 +543,12 @@ CommandObjectBreakpointCommandRemove::CommandObjectBreakpointCommandRemove (Comm m_arguments.push_back (arg); } -CommandObjectBreakpointCommandRemove::~CommandObjectBreakpointCommandRemove () +CommandObjectBreakpointCommandDelete::~CommandObjectBreakpointCommandDelete () { } bool -CommandObjectBreakpointCommandRemove::Execute +CommandObjectBreakpointCommandDelete::Execute ( Args& command, CommandReturnObject &result @@ -558,7 +558,7 @@ CommandObjectBreakpointCommandRemove::Execute if (target == NULL) { - result.AppendError ("There is not a current executable; there are no breakpoints from which to remove commands"); + result.AppendError ("There is not a current executable; there are no breakpoints from which to delete commands"); result.SetStatus (eReturnStatusFailed); return false; } @@ -568,14 +568,14 @@ CommandObjectBreakpointCommandRemove::Execute if (num_breakpoints == 0) { - result.AppendError ("No breakpoints exist to have commands removed"); + result.AppendError ("No breakpoints exist to have commands deleted"); result.SetStatus (eReturnStatusFailed); return false; } if (command.GetArgumentCount() == 0) { - result.AppendError ("No breakpoint specified from which to remove the commands"); + result.AppendError ("No breakpoint specified from which to delete the commands"); result.SetStatus (eReturnStatusFailed); return false; } @@ -760,15 +760,15 @@ CommandObjectBreakpointCommand::CommandObjectBreakpointCommand (CommandInterpret { bool status; CommandObjectSP add_command_object (new CommandObjectBreakpointCommandAdd (interpreter)); - CommandObjectSP remove_command_object (new CommandObjectBreakpointCommandRemove (interpreter)); + CommandObjectSP delete_command_object (new CommandObjectBreakpointCommandDelete (interpreter)); CommandObjectSP list_command_object (new CommandObjectBreakpointCommandList (interpreter)); add_command_object->SetCommandName ("breakpoint command add"); - remove_command_object->SetCommandName ("breakpoint command remove"); + delete_command_object->SetCommandName ("breakpoint command delete"); list_command_object->SetCommandName ("breakpoint command list"); status = LoadSubCommand ("add", add_command_object); - status = LoadSubCommand ("remove", remove_command_object); + status = LoadSubCommand ("delete", delete_command_object); status = LoadSubCommand ("list", list_command_object); } diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.h b/lldb/source/Commands/CommandObjectBreakpointCommand.h index 38f958b6ceb..65f72d0e290 100644 --- a/lldb/source/Commands/CommandObjectBreakpointCommand.h +++ b/lldb/source/Commands/CommandObjectBreakpointCommand.h @@ -130,16 +130,16 @@ private: }; //------------------------------------------------------------------------- -// CommandObjectBreakpointCommandRemove +// CommandObjectBreakpointCommandDelete //------------------------------------------------------------------------- -class CommandObjectBreakpointCommandRemove : public CommandObject +class CommandObjectBreakpointCommandDelete : public CommandObject { public: - CommandObjectBreakpointCommandRemove (CommandInterpreter &interpreter); + CommandObjectBreakpointCommandDelete (CommandInterpreter &interpreter); virtual - ~CommandObjectBreakpointCommandRemove (); + ~CommandObjectBreakpointCommandDelete (); virtual bool Execute (Args& command, diff --git a/lldb/test/abbreviation_tests/TestAbbreviations.py b/lldb/test/abbreviation_tests/TestAbbreviations.py index 738d5fb81a4..1f718e9ca85 100644 --- a/lldb/test/abbreviation_tests/TestAbbreviations.py +++ b/lldb/test/abbreviation_tests/TestAbbreviations.py @@ -94,7 +94,7 @@ class AbbreviationsTestCase(TestBase): "Breakpoint commands:", "print frame" ]) - self.runCmd("br co rem 1") + self.runCmd("br co del 1") self.expect("breakpoint command list 1", startstr = "Breakpoint 1 does not have an associated command.") diff --git a/lldb/test/breakpoint_command/TestBreakpointCommand.py b/lldb/test/breakpoint_command/TestBreakpointCommand.py index c892ea11573..175c432c06d 100644 --- a/lldb/test/breakpoint_command/TestBreakpointCommand.py +++ b/lldb/test/breakpoint_command/TestBreakpointCommand.py @@ -1,5 +1,5 @@ """ -Test lldb breakpoint command add/list/remove. +Test lldb breakpoint command add/list/delete. """ import os, time @@ -18,13 +18,13 @@ class BreakpointCommandTestCase(TestBase): @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") def test_with_dsym(self): - """Test a sequence of breakpoint command add, list, and remove.""" + """Test a sequence of breakpoint command add, list, and delete.""" self.buildDsym() self.breakpoint_command_sequence() self.breakpoint_command_script_parameters () def test_with_dwarf(self): - """Test a sequence of breakpoint command add, list, and remove.""" + """Test a sequence of breakpoint command add, list, and delete.""" self.buildDwarf() self.breakpoint_command_sequence() self.breakpoint_command_script_parameters () @@ -36,7 +36,7 @@ class BreakpointCommandTestCase(TestBase): self.line = line_number('main.c', '// Set break point at this line.') def breakpoint_command_sequence(self): - """Test a sequence of breakpoint command add, list, and remove.""" + """Test a sequence of breakpoint command add, list, and delete.""" exe = os.path.join(os.getcwd(), "a.out") self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) @@ -98,7 +98,7 @@ class BreakpointCommandTestCase(TestBase): self.runCmd("process continue") # Remove the breakpoint command associated with breakpoint 1. - self.runCmd("breakpoint command remove 1") + self.runCmd("breakpoint command delete 1") # Remove breakpoint 2. self.runCmd("breakpoint delete 2") |
