[nemiver/follow-fork-mode: 13/35] Rename the IDebugger::BreakPoint into IDebugger::Breakpoint
- From: Dodji Seketeli <dodji src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nemiver/follow-fork-mode: 13/35] Rename the IDebugger::BreakPoint into IDebugger::Breakpoint
- Date: Thu, 6 May 2010 10:17:11 +0000 (UTC)
commit 087e6dcb7df4fee60dc10aee01c416f97d28193d
Author: Dodji Seketeli <dodji redhat com>
Date: Sat Apr 10 17:41:41 2010 +0200
Rename the IDebugger::BreakPoint into IDebugger::Breakpoint
* src/dbgengine/nmv-i-debugger.h (*): Rename BreakPoint into
Breakpoint.
* src/dbgengine/nmv-dbg-common.h: Adjust.
* src/dbgengine/nmv-gdb-engine.[h|cc: Likewise.
* src/dbgengine/nmv-gdbmi-parser.[h|cc]: Likewise.
* src/persp/dbgperspective/menus/menus.xml: Likewise.
* src/persp/dbgperspective/nmv-breakpoints-view.[h|cc]: Likewise.
* src/persp/dbgperspective/nmv-dbg-perspective.[cc|h]: Likewise.
* src/persp/dbgperspective/nmv-sess-mgr.[h|cc]: Likewise.
* tests/test-breakpoint.cc: Likewise.
* tests/test-gdbmi.cc: Likewise.
* tests/test-var-path-expr.cc: Likewise.
* tests/test-watchpoint.cc: Likewise.
src/dbgengine/nmv-dbg-common.h | 6 +-
src/dbgengine/nmv-gdb-engine.cc | 32 ++--
src/dbgengine/nmv-gdb-engine.h | 12 +-
src/dbgengine/nmv-gdbmi-parser.cc | 16 +-
src/dbgengine/nmv-gdbmi-parser.h | 4 +-
src/dbgengine/nmv-i-debugger.h | 12 +-
src/persp/dbgperspective/menus/menus.xml | 8 +-
src/persp/dbgperspective/nmv-breakpoints-view.cc | 44 +++---
src/persp/dbgperspective/nmv-breakpoints-view.h | 4 +-
src/persp/dbgperspective/nmv-dbg-perspective.cc | 181 +++++++++++++---------
src/persp/dbgperspective/nmv-dbg-perspective.h | 4 +-
src/persp/dbgperspective/nmv-sess-mgr.cc | 4 +-
src/persp/dbgperspective/nmv-sess-mgr.h | 14 +-
tests/test-breakpoint.cc | 8 +-
tests/test-gdbmi.cc | 6 +-
tests/test-var-path-expr.cc | 4 +-
tests/test-watchpoint.cc | 4 +-
17 files changed, 197 insertions(+), 166 deletions(-)
---
diff --git a/src/dbgengine/nmv-dbg-common.h b/src/dbgengine/nmv-dbg-common.h
index ce8d45a..d6d2ce1 100644
--- a/src/dbgengine/nmv-dbg-common.h
+++ b/src/dbgengine/nmv-dbg-common.h
@@ -351,7 +351,7 @@ public:
private:
Kind m_kind;
- map<int, IDebugger::BreakPoint> m_breakpoints;
+ map<int, IDebugger::Breakpoint> m_breakpoints;
map<UString, UString> m_attrs;
//call stack listed members
@@ -479,11 +479,11 @@ public:
Kind kind () const {return m_kind;}
void kind (Kind a_in) {m_kind = a_in;}
- const map<int, IDebugger::BreakPoint>& breakpoints () const
+ const map<int, IDebugger::Breakpoint>& breakpoints () const
{
return m_breakpoints;
}
- map<int, IDebugger::BreakPoint>& breakpoints () {return m_breakpoints;}
+ map<int, IDebugger::Breakpoint>& breakpoints () {return m_breakpoints;}
map<UString, UString>& attrs () {return m_attrs;}
const map<UString, UString>& attrs () const {return m_attrs;}
diff --git a/src/dbgengine/nmv-gdb-engine.cc b/src/dbgengine/nmv-gdb-engine.cc
index 3666276..c507646 100644
--- a/src/dbgengine/nmv-gdb-engine.cc
+++ b/src/dbgengine/nmv-gdb-engine.cc
@@ -107,7 +107,7 @@ public:
list<Command> queued_commands;
list<Command> started_commands;
bool line_busy;
- map<int, IDebugger::BreakPoint> cached_breakpoints;
+ map<int, IDebugger::Breakpoint> cached_breakpoints;
enum InBufferStatus {
DEFAULT,
FILLING,
@@ -148,7 +148,7 @@ public:
mutable sigc::signal<void> detached_from_target_signal;
mutable sigc::signal<void,
- const map<int, IDebugger::BreakPoint>&,
+ const map<int, IDebugger::Breakpoint>&,
const UString&> breakpoints_set_signal;
mutable sigc::signal<void,
@@ -156,14 +156,14 @@ public:
const UString&> got_overloads_choice_signal;
mutable sigc::signal<void,
- const IDebugger::BreakPoint&,
+ const IDebugger::Breakpoint&,
int,
const UString&> breakpoint_deleted_signal;
- mutable sigc::signal<void, const IDebugger::BreakPoint&, int>
+ mutable sigc::signal<void, const IDebugger::Breakpoint&, int>
breakpoint_disabled_signal;
- mutable sigc::signal<void, const IDebugger::BreakPoint&, int>
+ mutable sigc::signal<void, const IDebugger::Breakpoint&, int>
breakpoint_enabled_signal;
mutable sigc::signal<void, IDebugger::StopReason,
@@ -1083,11 +1083,11 @@ struct OnDetachHandler : OutputHandler {
}
};//end OnDetachHandler
-struct OnBreakPointHandler: OutputHandler {
+struct OnBreakpointHandler: OutputHandler {
GDBEngine * m_engine;
vector<UString>m_prompt_choices;
- OnBreakPointHandler (GDBEngine *a_engine = 0) :
+ OnBreakpointHandler (GDBEngine *a_engine = 0) :
m_engine (a_engine)
{
}
@@ -1202,8 +1202,8 @@ struct OnBreakPointHandler: OutputHandler {
tmp.chomp ();
int bkpt_number = atoi (tmp.c_str ());
if (bkpt_number) {
- map<int, IDebugger::BreakPoint>::iterator iter;
- map<int, IDebugger::BreakPoint> &breaks =
+ map<int, IDebugger::Breakpoint>::iterator iter;
+ map<int, IDebugger::Breakpoint> &breaks =
m_engine->get_cached_breakpoints ();
iter = breaks.find (bkpt_number);
if (iter != breaks.end ()) {
@@ -1228,7 +1228,7 @@ struct OnBreakPointHandler: OutputHandler {
LOG_DD ("finally, no breakpoint was detected as set/deleted");
}
}
-};//end struct OnBreakPointHandler
+};//end struct OnBreakpointHandler
struct OnStoppedHandler: OutputHandler {
GDBEngine *m_engine;
@@ -2838,7 +2838,7 @@ GDBEngine::init_output_handlers ()
m_priv->output_handler_list.add
(OutputHandlerSafePtr (new OnStoppedHandler (this)));
m_priv->output_handler_list.add
- (OutputHandlerSafePtr (new OnBreakPointHandler (this)));
+ (OutputHandlerSafePtr (new OnBreakpointHandler (this)));
m_priv->output_handler_list.add
(OutputHandlerSafePtr (new OnCommandDoneHandler (this)));
m_priv->output_handler_list.add
@@ -2953,13 +2953,13 @@ GDBEngine::detached_from_target_signal () const
return m_priv->detached_from_target_signal;
}
-sigc::signal<void, const IDebugger::BreakPoint&, int, const UString&>&
+sigc::signal<void, const IDebugger::Breakpoint&, int, const UString&>&
GDBEngine::breakpoint_deleted_signal () const
{
return m_priv->breakpoint_deleted_signal;
}
-sigc::signal<void, const map<int, IDebugger::BreakPoint>&, const UString&>&
+sigc::signal<void, const map<int, IDebugger::Breakpoint>&, const UString&>&
GDBEngine::breakpoints_set_signal () const
{
return m_priv->breakpoints_set_signal;
@@ -3714,7 +3714,7 @@ GDBEngine::list_breakpoints (const UString &a_cookie)
queue_command (Command ("list-breakpoint", "-break-list", a_cookie));
}
-map<int, IDebugger::BreakPoint>&
+map<int, IDebugger::Breakpoint>&
GDBEngine::get_cached_breakpoints ()
{
@@ -3723,9 +3723,9 @@ GDBEngine::get_cached_breakpoints ()
void
GDBEngine::append_breakpoints_to_cache
- (const map<int, IDebugger::BreakPoint> &a_breaks)
+ (const map<int, IDebugger::Breakpoint> &a_breaks)
{
- map<int, IDebugger::BreakPoint>::const_iterator iter;
+ map<int, IDebugger::Breakpoint>::const_iterator iter;
for (iter = a_breaks.begin (); iter != a_breaks.end (); ++iter) {
m_priv->cached_breakpoints[iter->first] = iter->second;
}
diff --git a/src/dbgengine/nmv-gdb-engine.h b/src/dbgengine/nmv-gdb-engine.h
index 5562396..ca97f0b 100644
--- a/src/dbgengine/nmv-gdb-engine.h
+++ b/src/dbgengine/nmv-gdb-engine.h
@@ -69,19 +69,19 @@ public:
sigc::signal<void>& detached_from_target_signal () const;
- sigc::signal<void, const map<int, IDebugger::BreakPoint>&, const UString&>&
+ sigc::signal<void, const map<int, IDebugger::Breakpoint>&, const UString&>&
breakpoints_set_signal () const;
sigc::signal<void, const vector<OverloadsChoiceEntry>&, const UString&>&
got_overloads_choice_signal () const;
- sigc::signal<void, const IDebugger::BreakPoint&, int, const UString&>&
+ sigc::signal<void, const IDebugger::Breakpoint&, int, const UString&>&
breakpoint_deleted_signal () const;
- sigc::signal<void, const IDebugger::BreakPoint&, int>&
+ sigc::signal<void, const IDebugger::Breakpoint&, int>&
breakpoint_disabled_signal () const;
- sigc::signal<void, const IDebugger::BreakPoint&, int>&
+ sigc::signal<void, const IDebugger::Breakpoint&, int>&
breakpoint_enabled_signal () const;
@@ -280,7 +280,7 @@ public:
void init_output_handlers ();
- void append_breakpoints_to_cache (const map<int, IDebugger::BreakPoint>&);
+ void append_breakpoints_to_cache (const map<int, IDebugger::Breakpoint>&);
void do_continue (const UString &a_cookie);
@@ -355,7 +355,7 @@ public:
void list_breakpoints (const UString &a_cookie);
- map<int, IDebugger::BreakPoint>& get_cached_breakpoints ();
+ map<int, IDebugger::Breakpoint>& get_cached_breakpoints ();
void set_catch (const UString &a_event,
const UString &a_cookie) ;
diff --git a/src/dbgengine/nmv-gdbmi-parser.cc b/src/dbgengine/nmv-gdbmi-parser.cc
index 09379eb..47b5271 100644
--- a/src/dbgengine/nmv-gdbmi-parser.cc
+++ b/src/dbgengine/nmv-gdbmi-parser.cc
@@ -1764,7 +1764,7 @@ fetch_gdbmi_result:
if (!m_priv->input.raw ().compare (cur, strlen (PREFIX_BKPT),
PREFIX_BKPT)) {
- IDebugger::BreakPoint breakpoint;
+ IDebugger::Breakpoint breakpoint;
if (parse_breakpoint (cur, cur, breakpoint)) {
result_record.breakpoints ()[breakpoint.number ()] =
breakpoint;
@@ -1772,7 +1772,7 @@ fetch_gdbmi_result:
} else if (!m_priv->input.compare (cur,
strlen (PREFIX_BREAKPOINT_TABLE),
PREFIX_BREAKPOINT_TABLE)) {
- map<int, IDebugger::BreakPoint> breaks;
+ map<int, IDebugger::Breakpoint> breaks;
if (parse_breakpoint_table (cur, cur, breaks)) {
result_record.breakpoints () = breaks;
}
@@ -2060,7 +2060,7 @@ fetch_gdbmi_result:
bool
GDBMIParser::parse_breakpoint (Glib::ustring::size_type a_from,
Glib::ustring::size_type &a_to,
- IDebugger::BreakPoint &a_bkpt)
+ IDebugger::Breakpoint &a_bkpt)
{
LOG_FUNCTION_SCOPE_NORMAL_D (GDBMI_PARSING_DOMAIN);
@@ -2194,9 +2194,9 @@ GDBMIParser::parse_breakpoint (Glib::ustring::size_type a_from,
string type = attrs["type"];
if (type.find ("breakpoint") != type.npos)
- a_bkpt.type (IDebugger::BreakPoint::STANDARD_BREAKPOINT_TYPE);
+ a_bkpt.type (IDebugger::Breakpoint::STANDARD_BREAKPOINT_TYPE);
else if (type.find ("watchpoint") != type.npos)
- a_bkpt.type (IDebugger::BreakPoint::WATCHPOINT_TYPE);
+ a_bkpt.type (IDebugger::Breakpoint::WATCHPOINT_TYPE);
//TODO: get the 'at' attribute that is present on targets that
//are not compiled with -g.
@@ -2207,7 +2207,7 @@ GDBMIParser::parse_breakpoint (Glib::ustring::size_type a_from,
bool
GDBMIParser::parse_breakpoint_table (UString::size_type a_from,
UString::size_type &a_to,
- map<int, IDebugger::BreakPoint> &a_breakpoints)
+ map<int, IDebugger::Breakpoint> &a_breakpoints)
{
LOG_FUNCTION_SCOPE_NORMAL_D (GDBMI_PARSING_DOMAIN);
UString::size_type cur=a_from;
@@ -2235,13 +2235,13 @@ GDBMIParser::parse_breakpoint_table (UString::size_type a_from,
return false;
}
- map<int, IDebugger::BreakPoint> breakpoint_table;
+ map<int, IDebugger::Breakpoint> breakpoint_table;
if (RAW_CHAR_AT (cur) == ']') {
//there are zero breakpoints ...
} else if (!RAW_INPUT.compare (cur, strlen (PREFIX_BKPT),
PREFIX_BKPT)) {
//there are some breakpoints
- IDebugger::BreakPoint breakpoint;
+ IDebugger::Breakpoint breakpoint;
while (true) {
if (RAW_INPUT.compare (cur, strlen (PREFIX_BKPT),
PREFIX_BKPT)) {
diff --git a/src/dbgengine/nmv-gdbmi-parser.h b/src/dbgengine/nmv-gdbmi-parser.h
index 1b60620..1b04c5d 100644
--- a/src/dbgengine/nmv-gdbmi-parser.h
+++ b/src/dbgengine/nmv-gdbmi-parser.h
@@ -519,11 +519,11 @@ public:
/// \return true in case of successful parsing, false otherwise.
bool parse_breakpoint (Glib::ustring::size_type a_from,
Glib::ustring::size_type &a_to,
- IDebugger::BreakPoint &a_bkpt);
+ IDebugger::Breakpoint &a_bkpt);
bool parse_breakpoint_table (UString::size_type a_from,
UString::size_type &a_to,
- map<int, IDebugger::BreakPoint> &a_breakpoints);
+ map<int, IDebugger::Breakpoint> &a_breakpoints);
/// parses the result of the gdbmi command
/// "-thread-list-ids".
diff --git a/src/dbgengine/nmv-i-debugger.h b/src/dbgengine/nmv-i-debugger.h
index 0747d77..b526f78 100644
--- a/src/dbgengine/nmv-i-debugger.h
+++ b/src/dbgengine/nmv-i-debugger.h
@@ -77,7 +77,7 @@ public:
typedef unsigned int register_id_t;
/// \brief a breakpoint descriptor
- class BreakPoint {
+ class Breakpoint {
public:
enum Type {
@@ -103,7 +103,7 @@ public:
bool m_is_write_watchpoint;
public:
- BreakPoint () {clear ();}
+ Breakpoint () {clear ();}
/// \name accessors
@@ -179,7 +179,7 @@ public:
m_is_read_watchpoint = false;
m_is_write_watchpoint = false;
}
- };//end class BreakPoint
+ };//end class Breakpoint
/// \brief an entry of a choice list
/// to choose between a list of overloaded
@@ -868,7 +868,7 @@ public:
virtual sigc::signal<void>& detached_from_target_signal () const=0;
virtual sigc::signal<void,
- const IDebugger::BreakPoint&,
+ const IDebugger::Breakpoint&,
int /*breakpoint command*/,
const UString & /*cookie*/>&
breakpoint_deleted_signal () const=0;
@@ -879,7 +879,7 @@ public:
/// IDebugger does not cache the list of breakpoints. This must
/// be fixed at some point.
virtual sigc::signal<void,
- const map<int, IDebugger::BreakPoint>&,
+ const map<int, IDebugger::Breakpoint>&,
const UString& /*cookie*/>&
breakpoints_set_signal () const=0;
@@ -1170,7 +1170,7 @@ public:
virtual void list_breakpoints (const UString &a_cookie="") = 0;
- virtual const map<int, BreakPoint>& get_cached_breakpoints () = 0;
+ virtual const map<int, Breakpoint>& get_cached_breakpoints () = 0;
virtual void choose_function_overload (int a_overload_number,
const UString &a_cookie="") = 0;
diff --git a/src/persp/dbgperspective/menus/menus.xml b/src/persp/dbgperspective/menus/menus.xml
index ccdb2f1..2019c95 100644
--- a/src/persp/dbgperspective/menus/menus.xml
+++ b/src/persp/dbgperspective/menus/menus.xml
@@ -66,13 +66,13 @@
<menuitem action="StepMenuItemAction" name="StepMenuItem"/>
<menuitem action="StepOutMenuItemAction" name="StepOutMenuItem"/>
<separator/>
- <menuitem action="ToggleBreakPointMenuItemAction"
+ <menuitem action="ToggleBreakpointMenuItemAction"
name="ToggleBreakMenuItem"/>
- <menuitem action="ToggleEnableBreakPointMenuItemAction"
+ <menuitem action="ToggleEnableBreakpointMenuItemAction"
name="ToggleEnableBreakMenuItem"/>
- <menuitem action="SetBreakPointMenuItemAction"
+ <menuitem action="SetBreakpointMenuItemAction"
name="SetBreakMenuItem"/>
- <menuitem action="SetBreakPointUsingDialogMenuItemAction"
+ <menuitem action="SetBreakpointUsingDialogMenuItemAction"
name="SetBreakUsingDialogMenuItem"/>
<menuitem action="SetWatchPointUsingDialogMenuItemAction"
name="SetWatchUsingDialogMenuItem"/>
diff --git a/src/persp/dbgperspective/nmv-breakpoints-view.cc b/src/persp/dbgperspective/nmv-breakpoints-view.cc
index 98369a8..1b08599 100644
--- a/src/persp/dbgperspective/nmv-breakpoints-view.cc
+++ b/src/persp/dbgperspective/nmv-breakpoints-view.cc
@@ -47,7 +47,7 @@ struct BPColumns : public Gtk::TreeModelColumnRecord {
Gtk::TreeModelColumn<int> hits;
Gtk::TreeModelColumn<Glib::ustring> expression;
Gtk::TreeModelColumn<int> ignore_count;
- Gtk::TreeModelColumn<IDebugger::BreakPoint> breakpoint;
+ Gtk::TreeModelColumn<IDebugger::Breakpoint> breakpoint;
Gtk::TreeModelColumn<bool> is_standard;
BPColumns ()
@@ -81,7 +81,7 @@ public:
Glib::RefPtr<Gtk::ListStore> list_store;
Gtk::Widget *breakpoints_menu;
sigc::signal<void,
- const IDebugger::BreakPoint&> go_to_breakpoint_signal;
+ const IDebugger::Breakpoint&> go_to_breakpoint_signal;
Glib::RefPtr<Gtk::ActionGroup> breakpoints_action_group;
IWorkbench& workbench;
IPerspective& perspective;
@@ -100,7 +100,7 @@ public:
init_actions ();
build_tree_view ();
void set_breakpoints
- (const std::map<int, IDebugger::BreakPoint> &a_breakpoints);
+ (const std::map<int, IDebugger::Breakpoint> &a_breakpoints);
// update breakpoint list when debugger indicates that the list of
// breakpoints has changed.
@@ -192,7 +192,7 @@ public:
}
void set_breakpoints
- (const std::map<int, IDebugger::BreakPoint> &a_breakpoints)
+ (const std::map<int, IDebugger::Breakpoint> &a_breakpoints)
{
if (a_breakpoints.empty ()) {
return;
@@ -204,7 +204,7 @@ public:
add_breakpoints (a_breakpoints);
} else {
//find breakpoints that need adding or updating
- std::map<int, IDebugger::BreakPoint>::const_iterator breakmap_iter;
+ std::map<int, IDebugger::Breakpoint>::const_iterator breakmap_iter;
for (breakmap_iter = a_breakpoints.begin ();
breakmap_iter != a_breakpoints.end ();
++breakmap_iter) {
@@ -224,11 +224,11 @@ public:
}
void add_breakpoints
- (const std::map<int, IDebugger::BreakPoint> &a_breakpoints)
+ (const std::map<int, IDebugger::Breakpoint> &a_breakpoints)
{
THROW_IF_FAIL (list_store);
- std::map<int, IDebugger::BreakPoint>::const_iterator break_iter;
+ std::map<int, IDebugger::Breakpoint>::const_iterator break_iter;
for (break_iter = a_breakpoints.begin ();
break_iter != a_breakpoints.end ();
++break_iter) {
@@ -237,10 +237,10 @@ public:
}
bool breakpoint_list_has_id
- (const std::map<int, IDebugger::BreakPoint> &a_breakpoints,
+ (const std::map<int, IDebugger::Breakpoint> &a_breakpoints,
int a_id)
{
- std::map<int, IDebugger::BreakPoint>::const_iterator breakmap_iter;
+ std::map<int, IDebugger::Breakpoint>::const_iterator breakmap_iter;
for (breakmap_iter = a_breakpoints.begin ();
breakmap_iter != a_breakpoints.end (); ++ breakmap_iter) {
if (a_id == breakmap_iter->second.number ()) {
@@ -251,7 +251,7 @@ public:
}
Gtk::TreeModel::iterator find_breakpoint_in_model
- (const IDebugger::BreakPoint &a_breakpoint)
+ (const IDebugger::Breakpoint &a_breakpoint)
{
THROW_IF_FAIL (list_store);
@@ -268,7 +268,7 @@ public:
}
void update_breakpoint (Gtk::TreeModel::iterator& a_iter,
- const IDebugger::BreakPoint &a_breakpoint)
+ const IDebugger::Breakpoint &a_breakpoint)
{
(*a_iter)[get_bp_cols ().breakpoint] = a_breakpoint;
(*a_iter)[get_bp_cols ().enabled] = a_breakpoint.enabled ();
@@ -284,11 +284,11 @@ public:
(*a_iter)[get_bp_cols ().is_standard] = false;
switch (a_breakpoint.type ()) {
- case IDebugger::BreakPoint::STANDARD_BREAKPOINT_TYPE:
+ case IDebugger::Breakpoint::STANDARD_BREAKPOINT_TYPE:
(*a_iter)[get_bp_cols ().type] = _("breakpoint");
(*a_iter)[get_bp_cols ().is_standard] = true;
break;
- case IDebugger::BreakPoint::WATCHPOINT_TYPE:
+ case IDebugger::Breakpoint::WATCHPOINT_TYPE:
(*a_iter)[get_bp_cols ().type] = _("watchtpoint");
break;
default:
@@ -298,7 +298,7 @@ public:
}
Gtk::TreeModel::iterator append_breakpoint
- (const IDebugger::BreakPoint &a_breakpoint)
+ (const IDebugger::Breakpoint &a_breakpoint)
{
Gtk::TreeModel::iterator tree_iter = list_store->append();
update_breakpoint (tree_iter, a_breakpoint);
@@ -410,7 +410,7 @@ public:
}
void on_debugger_breakpoints_set_signal
- (const map<int, IDebugger::BreakPoint> &a_breaks,
+ (const map<int, IDebugger::Breakpoint> &a_breaks,
const UString &a_cookie)
{
NEMIVER_TRY
@@ -450,7 +450,7 @@ public:
}
void on_debugger_breakpoint_deleted_signal
- (const IDebugger::BreakPoint &a_break, int a_break_number,
+ (const IDebugger::Breakpoint &a_break, int a_break_number,
const UString &a_cookie)
{
if (a_break.number () || a_cookie.empty()) {}
@@ -628,8 +628,8 @@ public:
bool is_standard_bp = false; //true if this is e.g. no watchpoint.
if (it
- && (((IDebugger::BreakPoint)(*it)[get_bp_cols ().breakpoint])).
- type () == IDebugger::BreakPoint::STANDARD_BREAKPOINT_TYPE) {
+ && (((IDebugger::Breakpoint)(*it)[get_bp_cols ().breakpoint])).
+ type () == IDebugger::Breakpoint::STANDARD_BREAKPOINT_TYPE) {
is_standard_bp = true;
LOG_DD ("breakpoint is standard");
} else {
@@ -652,8 +652,8 @@ public:
Gtk::TreeModel::iterator it = tree_view->get_model ()->get_iter (a_path);
bool is_standard_bp =
- (((IDebugger::BreakPoint)(*it)[get_bp_cols ().breakpoint]).type ()
- == IDebugger::BreakPoint::STANDARD_BREAKPOINT_TYPE)
+ (((IDebugger::Breakpoint)(*it)[get_bp_cols ().breakpoint]).type ()
+ == IDebugger::Breakpoint::STANDARD_BREAKPOINT_TYPE)
? true
: false;
@@ -689,7 +689,7 @@ BreakpointsView::widget () const
void
BreakpointsView::set_breakpoints
- (const std::map<int, IDebugger::BreakPoint> &a_breakpoints)
+ (const std::map<int, IDebugger::Breakpoint> &a_breakpoints)
{
THROW_IF_FAIL (m_priv);
m_priv->set_breakpoints (a_breakpoints);
@@ -712,7 +712,7 @@ BreakpointsView::re_init ()
m_priv->re_init ();
}
-sigc::signal<void, const IDebugger::BreakPoint&>&
+sigc::signal<void, const IDebugger::Breakpoint&>&
BreakpointsView::go_to_breakpoint_signal () const
{
THROW_IF_FAIL(m_priv);
diff --git a/src/persp/dbgperspective/nmv-breakpoints-view.h b/src/persp/dbgperspective/nmv-breakpoints-view.h
index 3829932..7f47763 100644
--- a/src/persp/dbgperspective/nmv-breakpoints-view.h
+++ b/src/persp/dbgperspective/nmv-breakpoints-view.h
@@ -56,11 +56,11 @@ public:
virtual ~BreakpointsView ();
Gtk::Widget& widget () const;
void set_breakpoints
- (const std::map<int, IDebugger::BreakPoint> &a_breakpoints);
+ (const std::map<int, IDebugger::Breakpoint> &a_breakpoints);
void clear ();
void re_init ();
sigc::signal<void,
- const IDebugger::BreakPoint&>&
+ const IDebugger::Breakpoint&>&
go_to_breakpoint_signal () const;
};//end BreakpointsView
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 3bb46b9..951a520 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -292,9 +292,9 @@ private:
void on_show_target_output_action ();
void on_find_text_response_signal (int);
void on_breakpoint_delete_action
- (const IDebugger::BreakPoint& a_breakpoint);
+ (const IDebugger::Breakpoint& a_breakpoint);
void on_breakpoint_go_to_source_action
- (const IDebugger::BreakPoint& a_breakpoint);
+ (const IDebugger::Breakpoint& a_breakpoint);
void on_thread_list_thread_selected_signal (int a_tid);
void on_switch_page_signal (GtkNotebookPage *a_page, guint a_page_num);
@@ -357,11 +357,11 @@ private:
const UString &a_cookie);
void on_debugger_breakpoints_set_signal
- (const map<int, IDebugger::BreakPoint> &,
+ (const map<int, IDebugger::Breakpoint> &,
const UString &a_cookie);
void on_debugger_breakpoint_deleted_signal
- (const IDebugger::BreakPoint&,
+ (const IDebugger::Breakpoint&,
int,
const UString &a_cookie);
@@ -562,7 +562,7 @@ public:
const vector<UString> &a_args,
const map<UString, UString> &a_env,
const UString &a_cwd,
- const vector<IDebugger::BreakPoint> &a_breaks,
+ const vector<IDebugger::Breakpoint> &a_breaks,
bool a_check_is_new_program = true,
bool a_close_opened_files = false);
@@ -596,9 +596,9 @@ public:
void set_breakpoint (const UString &a_func_name,
const UString &a_cond);
void append_breakpoint (int a_bp_num,
- const IDebugger::BreakPoint &a_breakpoint);
+ const IDebugger::Breakpoint &a_breakpoint);
void append_breakpoints
- (const map<int, IDebugger::BreakPoint> &a_breaks);
+ (const map<int, IDebugger::Breakpoint> &a_breaks);
bool get_breakpoint_number (const UString &a_file_name,
int a_linenum,
@@ -902,7 +902,7 @@ struct DBGPerspective::Priv {
int current_page_num;
IDebuggerSafePtr debugger;
IDebugger::Frame current_frame;
- map<int, IDebugger::BreakPoint> breakpoints;
+ map<int, IDebugger::Breakpoint> breakpoints;
ISessMgrSafePtr session_manager;
ISessMgr::Session session;
IProcMgrSafePtr process_manager;
@@ -1659,7 +1659,7 @@ DBGPerspective::on_find_text_response_signal (int a_response)
void
DBGPerspective::on_breakpoint_delete_action
- (const IDebugger::BreakPoint& a_breakpoint)
+ (const IDebugger::Breakpoint& a_breakpoint)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
@@ -1669,7 +1669,7 @@ DBGPerspective::on_breakpoint_delete_action
void
DBGPerspective::on_breakpoint_go_to_source_action
- (const IDebugger::BreakPoint& a_breakpoint)
+ (const IDebugger::Breakpoint& a_breakpoint)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
// FIXME: this should put the same effort into
@@ -2297,7 +2297,7 @@ DBGPerspective::on_debugger_command_done_signal (const UString &a_command,
void
DBGPerspective::on_debugger_breakpoints_set_signal
- (const map<int, IDebugger::BreakPoint> &a_breaks,
+ (const map<int, IDebugger::Breakpoint> &a_breaks,
const UString &a_cookie)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -2317,7 +2317,7 @@ DBGPerspective::on_debugger_breakpoints_set_signal
int line = atoi
(a_cookie.substr (start_of_line,
a_cookie.size () - start_of_line).c_str ());
- map<int, IDebugger::BreakPoint>::const_iterator break_iter;
+ map<int, IDebugger::Breakpoint>::const_iterator break_iter;
for (break_iter = a_breaks.begin ();
break_iter != a_breaks.end ();
++break_iter) {
@@ -2482,7 +2482,7 @@ DBGPerspective::on_frame_selected_signal (int /* a_index */,
void
DBGPerspective::on_debugger_breakpoint_deleted_signal
- (const IDebugger::BreakPoint &,
+ (const IDebugger::Breakpoint &,
int a_break_number,
const UString &a_cookie)
{
@@ -3150,7 +3150,7 @@ DBGPerspective::init_actions ()
false
},
{
- "ToggleBreakPointMenuItemAction",
+ "ToggleBreakpointMenuItemAction",
nil_stock_id,
//don't translate, name will be overwritten based on context
"Toggle _Breakpoint",
@@ -3162,7 +3162,7 @@ DBGPerspective::init_actions ()
false
},
{
- "ToggleEnableBreakPointMenuItemAction",
+ "ToggleEnableBreakpointMenuItemAction",
nil_stock_id,
//don't translate, name will be overwritten based on context
"Enable/Disable Breakpoint",
@@ -3176,7 +3176,7 @@ DBGPerspective::init_actions ()
false
},
{
- "SetBreakPointMenuItemAction",
+ "SetBreakpointMenuItemAction",
nil_stock_id,
_("Set Breakpoint..."),
_("Set a breakpoint at a function or line number"),
@@ -3186,7 +3186,7 @@ DBGPerspective::init_actions ()
false
},
{
- "SetBreakPointUsingDialogMenuItemAction",
+ "SetBreakpointUsingDialogMenuItemAction",
nil_stock_id,
_("Set Breakpoint with dialog..."),
_("Set a breakpoint at the current line using a dialog"),
@@ -4220,16 +4220,16 @@ DBGPerspective::get_contextual_menu ()
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
"/ContextualMenu",
- "ToggleBreakPointMenuItem",
- "ToggleBreakPointMenuItemAction",
+ "ToggleBreakpointMenuItem",
+ "ToggleBreakpointMenuItemAction",
Gtk::UI_MANAGER_AUTO,
false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
"/ContextualMenu",
- "ToggleEnableBreakPointMenuItem",
- "ToggleEnableBreakPointMenuItemAction",
+ "ToggleEnableBreakpointMenuItem",
+ "ToggleEnableBreakpointMenuItemAction",
Gtk::UI_MANAGER_AUTO,
false);
@@ -4855,13 +4855,13 @@ DBGPerspective::record_and_save_session (ISessMgr::Session &a_session)
// Record regular breakpoints and watchpoints in the session
a_session.breakpoints ().clear ();
a_session.watchpoints ().clear ();
- map<int, IDebugger::BreakPoint>::const_iterator break_iter;
+ map<int, IDebugger::Breakpoint>::const_iterator break_iter;
for (break_iter = m_priv->breakpoints.begin ();
break_iter != m_priv->breakpoints.end ();
++break_iter) {
if (break_iter->second.type ()
- == IDebugger::BreakPoint::STANDARD_BREAKPOINT_TYPE) {
- ISessMgr::BreakPoint bp (break_iter->second.file_name (),
+ == IDebugger::Breakpoint::STANDARD_BREAKPOINT_TYPE) {
+ ISessMgr::Breakpoint bp (break_iter->second.file_name (),
break_iter->second.file_full_name (),
break_iter->second.line (),
break_iter->second.enabled (),
@@ -4870,7 +4870,7 @@ DBGPerspective::record_and_save_session (ISessMgr::Session &a_session)
a_session.breakpoints ().push_back (bp);
LOG_DD ("Regular breakpoint scheduled to be stored");
} else if (break_iter->second.type ()
- == IDebugger::BreakPoint::WATCHPOINT_TYPE) {
+ == IDebugger::Breakpoint::WATCHPOINT_TYPE) {
ISessMgr::WatchPoint wp (break_iter->second.expression (),
break_iter->second.is_write_watchpoint (),
break_iter->second.is_read_watchpoint ());
@@ -5658,9 +5658,9 @@ DBGPerspective::execute_session (ISessMgr::Session &a_session)
close_opened_files ();
}
- IDebugger::BreakPoint breakpoint;
- vector<IDebugger::BreakPoint> breakpoints;
- for (list<ISessMgr::BreakPoint>::const_iterator it =
+ IDebugger::Breakpoint breakpoint;
+ vector<IDebugger::Breakpoint> breakpoints;
+ for (list<ISessMgr::Breakpoint>::const_iterator it =
m_priv->session.breakpoints ().begin ();
it != m_priv->session.breakpoints ().end ();
++it) {
@@ -5679,7 +5679,7 @@ DBGPerspective::execute_session (ISessMgr::Session &a_session)
it != m_priv->session.watchpoints ().end ();
++it) {
breakpoint.clear ();
- breakpoint.type (IDebugger::BreakPoint::WATCHPOINT_TYPE);
+ breakpoint.type (IDebugger::Breakpoint::WATCHPOINT_TYPE);
breakpoint.expression (it->expression ());
breakpoint.is_read_watchpoint (it->is_read ());
breakpoint.is_write_watchpoint (it->is_write ());
@@ -5744,7 +5744,7 @@ DBGPerspective::execute_program ()
THROW_IF_FAIL (cwd != "");
map<UString, UString> env = dialog.environment_variables();
- vector<IDebugger::BreakPoint> breaks;
+ vector<IDebugger::Breakpoint> breaks;
execute_program (prog, args, env, cwd, breaks, true, true);
m_priv->reused_session = false;
}
@@ -5759,8 +5759,8 @@ void
DBGPerspective::execute_last_program_in_memory ()
{
if (!m_priv->prog_path.empty ()) {
- vector<IDebugger::BreakPoint> breakpoints;
- map<int, IDebugger::BreakPoint>::const_iterator it;
+ vector<IDebugger::Breakpoint> breakpoints;
+ map<int, IDebugger::Breakpoint>::const_iterator it;
for (it = m_priv->breakpoints.begin ();
it != m_priv->breakpoints.end ();
++it) {
@@ -5781,7 +5781,7 @@ DBGPerspective::execute_program (const UString &a_prog,
const UString &a_cwd,
bool a_close_opened_files)
{
- vector<IDebugger::BreakPoint> bps;
+ vector<IDebugger::Breakpoint> bps;
execute_program (a_prog, a_args, a_env,
a_cwd, bps, true,
a_close_opened_files);
@@ -5810,7 +5810,7 @@ DBGPerspective::execute_program
const vector<UString> &a_args,
const map<UString, UString> &a_env,
const UString &a_cwd,
- const vector<IDebugger::BreakPoint> &a_breaks,
+ const vector<IDebugger::Breakpoint> &a_breaks,
bool a_check_is_new_program,
bool a_close_opened_files)
{
@@ -5877,7 +5877,7 @@ DBGPerspective::execute_program
// delete old breakpoints, if any.
if (is_new_program) {
- map<int, IDebugger::BreakPoint>::const_iterator bp_it;
+ map<int, IDebugger::Breakpoint>::const_iterator bp_it;
for (bp_it = m_priv->breakpoints.begin ();
bp_it != m_priv->breakpoints.end ();
++bp_it) {
@@ -5911,7 +5911,7 @@ DBGPerspective::execute_program
if (a_breaks.empty ()) {
dbg_engine->set_breakpoint ("main");
} else {
- vector<IDebugger::BreakPoint>::const_iterator it;
+ vector<IDebugger::Breakpoint>::const_iterator it;
for (it = a_breaks.begin (); it != a_breaks.end (); ++it) {
// if the breakpoint was marked as 'disabled'
// in the session DB, we
@@ -5927,13 +5927,13 @@ DBGPerspective::execute_program
+ "#"
+ UString::from_int(it->line ());
if (it->type ()
- == IDebugger::BreakPoint::STANDARD_BREAKPOINT_TYPE)
+ == IDebugger::Breakpoint::STANDARD_BREAKPOINT_TYPE)
dbg_engine->set_breakpoint (it->file_full_name (),
it->line (),
it->condition (),
it->ignore_count (),
cookie);
- else if (it->type () == IDebugger::BreakPoint::WATCHPOINT_TYPE)
+ else if (it->type () == IDebugger::Breakpoint::WATCHPOINT_TYPE)
dbg_engine->set_watchpoint (it->expression (),
it->is_write_watchpoint (),
it->is_read_watchpoint ());
@@ -6242,54 +6242,85 @@ DBGPerspective::set_breakpoint (const UString &a_func_name,
}
void
+DBGPerspective::set_breakpoint (const Address &a_address)
+{
+ debugger ()->set_breakpoint (a_address);
+}
+
+void
DBGPerspective::append_breakpoint (int a_bp_num,
- const IDebugger::BreakPoint &a_breakpoint)
+ const IDebugger::Breakpoint &a_breakpoint)
{
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+
UString file_path;
file_path = a_breakpoint.file_full_name ();
- IDebugger::BreakPoint::Type type = a_breakpoint.type ();
-
- // If the file full path info is not present,
- // 1/ lookup in the files opened in the perspective already.
- // 2/ lookup in the list of source directories
- if (type == IDebugger::BreakPoint::STANDARD_BREAKPOINT_TYPE
- && file_path == "") {
- UString file_name = a_breakpoint.file_name ();
- LOG_DD ("no full path info present for file '"
- + file_name + "'");
- if (file_name == "") {
- UString message;
- message.printf
- (_("There is no file name info for symbol addr: %s %s"),
- a_breakpoint.function ().c_str (),
- a_breakpoint.address ().c_str ());
- LOG_ERROR (message);
- return;
- }
- else
- {
- file_path = file_name;
- }
+ IDebugger::Breakpoint::Type type = a_breakpoint.type ();
+ SourceEditor *editor = 0;
+
+ if (type == IDebugger::Breakpoint::STANDARD_BREAKPOINT_TYPE
+ && file_path.empty ()) {
+ file_path = a_breakpoint.file_name ();
}
- LOG_DD ("record breakpoint " << file_path << ":"
- << a_breakpoint.line () - 1);
+
m_priv->breakpoints[a_bp_num] = a_breakpoint;
m_priv->breakpoints[a_bp_num].file_full_name (file_path);
- // Append the visual representation of the breakpoint if it's a standard
- // breakpoint, i.e. not a watchpoint. We don't have any visual
- // representation of watchpoints yet.
- if (type == IDebugger::BreakPoint::STANDARD_BREAKPOINT_TYPE)
- append_visual_breakpoint (file_path, a_breakpoint.line () - 1,
- a_breakpoint.enabled ());
+
+ // We don't know how to graphically represent non-standard
+ // breakpoints (e.g watchpoints) at this moment.
+ if (type != IDebugger::Breakpoint::STANDARD_BREAKPOINT_TYPE)
+ return;
+
+ editor = get_or_append_source_editor_from_path (file_path);
+
+ if (editor) {
+ // We could find an editor for the file of the breakpoint.
+ // Set the visual breakpoint at the breakpoint source line.
+ SourceEditor::BufferType type = editor->get_buffer_type ();
+ switch (type) {
+ case SourceEditor::BUFFER_TYPE_SOURCE:
+ append_visual_breakpoint (editor, a_breakpoint.line (),
+ a_breakpoint.enabled ());
+ break;
+ case SourceEditor::BUFFER_TYPE_ASSEMBLY:
+ append_visual_breakpoint (editor, a_breakpoint.address (),
+ a_breakpoint.enabled ());
+ break;
+ case SourceEditor::BUFFER_TYPE_UNDEFINED:
+ break;
+ }
+ } else {
+ // We not could find an editor for the file of the breakpoint.
+ // Ask the backend for asm instructions and set the visual breakpoint
+ // at the breakpoint address.
+ Glib::RefPtr<SourceBuffer> buf;
+ editor = get_source_editor_from_path (get_asm_title ());
+ if (editor == 0) {
+ editor = create_source_editor (buf,
+ /*asm_view=*/true,
+ get_asm_title (),
+ /*current_line=*/-1,
+ /*current_address=*/"");
+ append_source_editor (*editor, "");
+ }
+ THROW_IF_FAIL (editor);
+ Address addr (a_breakpoint.address ());
+ IDebugger::DisassSlot set_bp =
+ sigc::bind (sigc::mem_fun (this,
+ &DBGPerspective::on_debugger_asm_signal3),
+ editor,
+ a_breakpoint);
+ disassemble_around_address_and_do (addr, set_bp);
+ }
}
void
DBGPerspective::append_breakpoints
- (const map<int, IDebugger::BreakPoint> &a_breaks)
+ (const map<int, IDebugger::Breakpoint> &a_breaks)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
- map<int, IDebugger::BreakPoint>::const_iterator iter;
+ map<int, IDebugger::Breakpoint>::const_iterator iter;
for (iter = a_breaks.begin (); iter != a_breaks.end (); ++iter)
append_breakpoint (iter->first, iter->second);
}
@@ -6304,7 +6335,7 @@ DBGPerspective::get_breakpoint_number (const UString &a_file_name,
LOG_DD ("searching for breakpoint " << breakpoint << ": ");
- map<int, IDebugger::BreakPoint>::const_iterator iter;
+ map<int, IDebugger::Breakpoint>::const_iterator iter;
for (iter = m_priv->breakpoints.begin ();
iter != m_priv->breakpoints.end ();
++iter) {
@@ -6353,7 +6384,7 @@ DBGPerspective::delete_breakpoint ()
bool
DBGPerspective::delete_breakpoint (int a_breakpoint_num)
{
- map<int, IDebugger::BreakPoint>::iterator iter =
+ map<int, IDebugger::Breakpoint>::iterator iter =
m_priv->breakpoints.find (a_breakpoint_num);
if (iter == m_priv->breakpoints.end ()) {
LOG_ERROR ("breakpoint " << (int) a_breakpoint_num << " not found");
@@ -6477,7 +6508,7 @@ DBGPerspective::delete_visual_breakpoint (const UString &a_file_name,
void
DBGPerspective::delete_visual_breakpoint (int a_breakpoint_num)
{
- map<int, IDebugger::BreakPoint>::iterator iter =
+ map<int, IDebugger::Breakpoint>::iterator iter =
m_priv->breakpoints.find (a_breakpoint_num);
if (iter == m_priv->breakpoints.end ()) {
LOG_ERROR ("breakpoint " << (int) a_breakpoint_num << " not found");
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.h b/src/persp/dbgperspective/nmv-dbg-perspective.h
index 91646f1..6e3a488 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.h
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.h
@@ -98,7 +98,7 @@ public:
const vector<UString> &a_args,
const map<UString, UString> &a_env,
const UString &a_cwd,
- const vector<IDebugger::BreakPoint>
+ const vector<IDebugger::Breakpoint>
&a_breaks,
bool a_check_is_new_program = true,
bool a_close_opened_files = false) = 0;
@@ -131,7 +131,7 @@ public:
const UString &a_condition="") = 0;
virtual void append_breakpoints
- (const map<int, IDebugger::BreakPoint> &a_breaks) = 0;
+ (const map<int, IDebugger::Breakpoint> &a_breaks) = 0;
virtual bool get_breakpoint_number (const UString &a_file_name,
int a_linenum,
diff --git a/src/persp/dbgperspective/nmv-sess-mgr.cc b/src/persp/dbgperspective/nmv-sess-mgr.cc
index dd236c5..6391e33 100644
--- a/src/persp/dbgperspective/nmv-sess-mgr.cc
+++ b/src/persp/dbgperspective/nmv-sess-mgr.cc
@@ -333,7 +333,7 @@ SessMgr::store_session (Session &a_session,
THROW_IF_FAIL
(trans.get ().get_connection ().execute_statement (query));
- list<SessMgr::BreakPoint>::const_iterator break_iter;
+ list<SessMgr::Breakpoint>::const_iterator break_iter;
for (break_iter = a_session.breakpoints ().begin ();
break_iter != a_session.breakpoints ().end ();
++break_iter) {
@@ -504,7 +504,7 @@ SessMgr::load_session (Session &a_session,
<< filename << "," << filefullname << ","
<< linenumber << "," << enabled << ","
<< condition<< "," << ignorecount);
- session.breakpoints ().push_back (SessMgr::BreakPoint (filename,
+ session.breakpoints ().push_back (SessMgr::Breakpoint (filename,
filefullname,
linenumber,
enabled,
diff --git a/src/persp/dbgperspective/nmv-sess-mgr.h b/src/persp/dbgperspective/nmv-sess-mgr.h
index 527d1d9..144ec16 100644
--- a/src/persp/dbgperspective/nmv-sess-mgr.h
+++ b/src/persp/dbgperspective/nmv-sess-mgr.h
@@ -55,7 +55,7 @@ protected:
ISessMgr () {};
public:
- class BreakPoint {
+ class Breakpoint {
UString m_file_name;
UString m_file_full_name;
int m_line_number;
@@ -64,7 +64,7 @@ public:
int m_ignore_count;
public:
- BreakPoint (const UString &a_file_name,
+ Breakpoint (const UString &a_file_name,
const UString &a_file_full_name,
const UString &a_line_number,
const UString &a_enabled,
@@ -78,7 +78,7 @@ public:
m_ignore_count (atoi (a_ignore_count.c_str ()))
{}
- BreakPoint (const UString &a_file_name,
+ Breakpoint (const UString &a_file_name,
const UString &a_file_full_name,
int a_line_number,
bool a_enabled,
@@ -92,7 +92,7 @@ public:
m_ignore_count (a_ignore_count)
{}
- BreakPoint () :
+ Breakpoint () :
m_line_number (0),
m_ignore_count (0)
{}
@@ -154,7 +154,7 @@ public:
gint64 m_session_id;
map<UString, UString> m_properties;
map<UString, UString> m_env_variables;
- list<BreakPoint> m_breakpoints;
+ list<Breakpoint> m_breakpoints;
list<WatchPoint> m_watchpoints;
list<UString> m_opened_files;
list<UString> m_search_paths;
@@ -180,8 +180,8 @@ public:
}
map<UString, UString>& env_variables () {return m_env_variables;}
- list<BreakPoint>& breakpoints () {return m_breakpoints;}
- const list<BreakPoint>& breakpoints () const { return m_breakpoints;}
+ list<Breakpoint>& breakpoints () {return m_breakpoints;}
+ const list<Breakpoint>& breakpoints () const { return m_breakpoints;}
list<WatchPoint>& watchpoints () {return m_watchpoints;}
const list<WatchPoint>& watchpoints () const {return m_watchpoints;}
diff --git a/tests/test-breakpoint.cc b/tests/test-breakpoint.cc
index bb51b49..2c7c885 100644
--- a/tests/test-breakpoint.cc
+++ b/tests/test-breakpoint.cc
@@ -43,13 +43,13 @@ on_command_done_signal (const UString &a_command,
}
void
-on_breakpoints_set_signal (const std::map<int, IDebugger::BreakPoint> &a_breaks,
+on_breakpoints_set_signal (const std::map<int, IDebugger::Breakpoint> &a_breaks,
const UString &a_cookie)
{
if (a_cookie.empty ()) {}
MESSAGE ("breakpoints set:");
- std::map<int, IDebugger::BreakPoint>::const_iterator it;
+ std::map<int, IDebugger::Breakpoint>::const_iterator it;
for (it = a_breaks.begin (); it != a_breaks.end () ; ++it) {
MESSAGE ("<break><num>" << it->first <<"</num><line>"
<< it->second.file_name () << ":" << it->second.line ()
@@ -125,8 +125,8 @@ on_stopped_signal (IDebugger::StopReason a_reason,
MESSAGE ("hit conditional breakpoint! bp number: "
<< a_bp_num);
}
- map<int, IDebugger::BreakPoint>::const_iterator it;
- map<int, IDebugger::BreakPoint>::const_iterator null_iter =
+ map<int, IDebugger::Breakpoint>::const_iterator it;
+ map<int, IDebugger::Breakpoint>::const_iterator null_iter =
a_debugger->get_cached_breakpoints ().end ();
if ((it = a_debugger->get_cached_breakpoints ().find (a_bp_num))
diff --git a/tests/test-gdbmi.cc b/tests/test-gdbmi.cc
index db503f4..42156a8 100644
--- a/tests/test-gdbmi.cc
+++ b/tests/test-gdbmi.cc
@@ -783,13 +783,13 @@ test_gdbmi_result ()
void
test_breakpoint_table ()
{
- std::map<int, IDebugger::BreakPoint> breakpoints;
+ std::map<int, IDebugger::Breakpoint> breakpoints;
UString::size_type cur = 0;
GDBMIParser parser (gv_breakpoint_table0);
BOOST_REQUIRE (parser.parse_breakpoint_table (cur, cur, breakpoints));
BOOST_REQUIRE_EQUAL (breakpoints.size (), 1u);
- std::map<int, IDebugger::BreakPoint>::const_iterator iter;
+ std::map<int, IDebugger::Breakpoint>::const_iterator iter;
iter = breakpoints.find (1);
BOOST_REQUIRE (iter != breakpoints.end ());
BOOST_REQUIRE_EQUAL (iter->second.number (), 1);
@@ -831,7 +831,7 @@ test_breakpoint_table ()
void
test_breakpoint ()
{
- IDebugger::BreakPoint breakpoint;
+ IDebugger::Breakpoint breakpoint;
GDBMIParser parser (gv_breakpoint0);
UString::size_type cur = 0;
diff --git a/tests/test-var-path-expr.cc b/tests/test-var-path-expr.cc
index 2b28004..bcdf3e4 100644
--- a/tests/test-var-path-expr.cc
+++ b/tests/test-var-path-expr.cc
@@ -27,13 +27,13 @@ on_program_finished_signal ()
}
static void
-on_breakpoints_set_signal (const std::map<int, IDebugger::BreakPoint> &a_breaks,
+on_breakpoints_set_signal (const std::map<int, IDebugger::Breakpoint> &a_breaks,
const UString &a_cookie)
{
if (a_cookie.empty ()) {}
MESSAGE ("breakpoints set:");
- std::map<int, IDebugger::BreakPoint>::const_iterator it;
+ std::map<int, IDebugger::Breakpoint>::const_iterator it;
for (it = a_breaks.begin (); it != a_breaks.end () ; ++it) {
MESSAGE ("<break><num>" << it->first <<"</num><line>"
<< it->second.file_name () << ":" << it->second.line ()
diff --git a/tests/test-watchpoint.cc b/tests/test-watchpoint.cc
index 4cd7c83..f945390 100644
--- a/tests/test-watchpoint.cc
+++ b/tests/test-watchpoint.cc
@@ -29,13 +29,13 @@ on_program_finished_signal ()
}
void
-on_breakpoints_set_signal (const std::map<int, IDebugger::BreakPoint> &a_breaks,
+on_breakpoints_set_signal (const std::map<int, IDebugger::Breakpoint> &a_breaks,
const UString &a_cookie)
{
if (a_cookie.empty ()) {}
MESSAGE ("breakpoints set:");
- std::map<int, IDebugger::BreakPoint>::const_iterator it;
+ std::map<int, IDebugger::Breakpoint>::const_iterator it;
for (it = a_breaks.begin (); it != a_breaks.end () ; ++it) {
MESSAGE ("<break><num>" << it->first <<"</num><line>"
<< it->second.file_name () << ":" << it->second.line ()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
