@@ -77,26 +77,27 @@ class CMICmdCmdBreakInsert : public CMICmdBase {
77
77
78
78
// Attributes:
79
79
private:
80
- bool m_bBrkPtIsTemp ;
80
+ bool m_bBreakpointIsTemp ;
81
81
bool m_bHaveArgOptionThreadGrp;
82
82
CMIUtilString m_brkName;
83
83
CMIUtilString m_strArgOptionThreadGrp;
84
- lldb::SBBreakpoint m_brkPt;
85
- bool m_bBrkPtIsPending;
86
- MIuint m_nBrkPtIgnoreCount;
87
- bool m_bBrkPtEnabled;
88
- bool m_bBrkPtCondition;
89
- CMIUtilString m_brkPtCondition;
90
- bool m_bBrkPtThreadId;
91
- MIuint m_nBrkPtThreadId;
92
- const CMIUtilString m_constStrArgNamedTempBrkPt;
93
- const CMIUtilString m_constStrArgNamedHWBrkPt; // Not handled by *this command
94
- const CMIUtilString m_constStrArgNamedPendinfBrkPt;
95
- const CMIUtilString m_constStrArgNamedDisableBrkPt;
84
+ lldb::SBBreakpoint m_breakpoint;
85
+ bool m_bBreakpointIsPending;
86
+ MIuint m_nBreakpointIgnoreCount;
87
+ bool m_bBreakpointEnabled;
88
+ bool m_bBreakpointCondition;
89
+ CMIUtilString m_breakpointCondition;
90
+ bool m_bBreakpointThreadId;
91
+ MIuint m_nBreakpointThreadId;
92
+ const CMIUtilString m_constStrArgNamedTempBreakpoint;
93
+ const CMIUtilString
94
+ m_constStrArgNamedHWBreakpoint; // Not handled by *this command
95
+ const CMIUtilString m_constStrArgNamedPendinfBreakpoint;
96
+ const CMIUtilString m_constStrArgNamedDisableBreakpoint;
96
97
const CMIUtilString m_constStrArgNamedTracePt; // Not handled by *this command
97
- const CMIUtilString m_constStrArgNamedConditionalBrkPt ;
98
+ const CMIUtilString m_constStrArgNamedConditionalBreakpoint ;
98
99
const CMIUtilString m_constStrArgNamedInoreCnt;
99
- const CMIUtilString m_constStrArgNamedRestrictBrkPtToThreadId ;
100
+ const CMIUtilString m_constStrArgNamedRestrictBreakpointToThreadId ;
100
101
const CMIUtilString m_constStrArgNamedLocation;
101
102
};
102
103
@@ -126,7 +127,7 @@ class CMICmdCmdBreakDelete : public CMICmdBase {
126
127
127
128
// Attributes:
128
129
private:
129
- const CMIUtilString m_constStrArgNamedBrkPt ;
130
+ const CMIUtilString m_constStrArgNamedBreakpoint ;
130
131
};
131
132
132
133
// ++
@@ -155,9 +156,9 @@ class CMICmdCmdBreakDisable : public CMICmdBase {
155
156
156
157
// Attributes:
157
158
private:
158
- const CMIUtilString m_constStrArgNamedBrkPt ;
159
- bool m_bBrkPtDisabledOk ;
160
- MIuint m_nMiStopPtId ;
159
+ const CMIUtilString m_constStrArgNamedBreakpoint ;
160
+ bool m_bBreakpointDisabledOk ;
161
+ MIuint m_nMiStoppointId ;
161
162
};
162
163
163
164
// ++
@@ -186,9 +187,9 @@ class CMICmdCmdBreakEnable : public CMICmdBase {
186
187
187
188
// Attributes:
188
189
private:
189
- const CMIUtilString m_constStrArgNamedBrkPt ;
190
- bool m_bBrkPtEnabledOk ;
191
- MIuint m_nMiStopPtId ;
190
+ const CMIUtilString m_constStrArgNamedBreakpoint ;
191
+ bool m_bBreakpointEnabledOk ;
192
+ MIuint m_nMiStoppointId ;
192
193
};
193
194
194
195
// ++
@@ -217,29 +218,30 @@ class CMICmdCmdBreakAfter : public CMICmdBase {
217
218
218
219
// Methods:
219
220
private:
220
- bool UpdateStopPtInfo (CMICmnLLDBDebugSessionInfo &rSessionInfo);
221
+ bool UpdateStoppointInfo (CMICmnLLDBDebugSessionInfo &rSessionInfo);
221
222
template <class T >
222
- bool SetIgnoreCount (CMICmnLLDBDebugSessionInfo &rSessionInfo, T &vrStopPt) {
223
- if (!vrStopPt.IsValid ()) {
224
- const CMIUtilString strBrkPtId (CMIUtilString::Format (
225
- " %" PRIu64, static_cast <uint64_t >(m_nMiStopPtId)));
226
- SetError (CMIUtilString::Format (MIRSRC (IDS_CMD_ERR_STOPPT_INVALID),
223
+ bool SetIgnoreCount (CMICmnLLDBDebugSessionInfo &rSessionInfo,
224
+ T &vrStoppoint) {
225
+ if (!vrStoppoint.IsValid ()) {
226
+ const CMIUtilString strBreakpointId (CMIUtilString::Format (
227
+ " %" PRIu64, static_cast <uint64_t >(m_nMiStoppointId)));
228
+ SetError (CMIUtilString::Format (MIRSRC (IDS_CMD_ERR_STOPPOINT_INVALID),
227
229
m_cmdData.strMiCmd .c_str (),
228
- strBrkPtId .c_str ()));
230
+ strBreakpointId .c_str ()));
229
231
return MIstatus::failure;
230
232
}
231
233
232
- vrStopPt .SetIgnoreCount (m_nBrkPtCount );
234
+ vrStoppoint .SetIgnoreCount (m_nBreakpointCount );
233
235
234
- return UpdateStopPtInfo (rSessionInfo);
236
+ return UpdateStoppointInfo (rSessionInfo);
235
237
}
236
238
237
239
// Attributes:
238
240
private:
239
241
const CMIUtilString m_constStrArgNamedNumber;
240
242
const CMIUtilString m_constStrArgNamedCount;
241
- MIuint m_nMiStopPtId ;
242
- MIuint m_nBrkPtCount ;
243
+ MIuint m_nMiStoppointId ;
244
+ MIuint m_nBreakpointCount ;
243
245
};
244
246
245
247
// ++
@@ -269,21 +271,21 @@ class CMICmdCmdBreakCondition : public CMICmdBase {
269
271
// Methods:
270
272
private:
271
273
CMIUtilString GetRestOfExpressionNotSurroundedInQuotes ();
272
- bool UpdateStopPtInfo (CMICmnLLDBDebugSessionInfo &rSessionInfo);
274
+ bool UpdateStoppointInfo (CMICmnLLDBDebugSessionInfo &rSessionInfo);
273
275
template <class T >
274
- bool SetCondition (CMICmnLLDBDebugSessionInfo &rSessionInfo, T &vrStopPt ) {
275
- if (!vrStopPt .IsValid ()) {
276
- const CMIUtilString strBrkPtId (CMIUtilString::Format (
277
- " %" PRIu64, static_cast <uint64_t >(m_nMiStopPtId )));
278
- SetError (CMIUtilString::Format (MIRSRC (IDS_CMD_ERR_STOPPT_INVALID ),
276
+ bool SetCondition (CMICmnLLDBDebugSessionInfo &rSessionInfo, T &vrStoppoint ) {
277
+ if (!vrStoppoint .IsValid ()) {
278
+ const CMIUtilString strBreakpointId (CMIUtilString::Format (
279
+ " %" PRIu64, static_cast <uint64_t >(m_nMiStoppointId )));
280
+ SetError (CMIUtilString::Format (MIRSRC (IDS_CMD_ERR_STOPPOINT_INVALID ),
279
281
m_cmdData.strMiCmd .c_str (),
280
- strBrkPtId .c_str ()));
282
+ strBreakpointId .c_str ()));
281
283
return MIstatus::failure;
282
284
}
283
285
284
- vrStopPt .SetCondition (m_strBrkPtExpr .c_str ());
286
+ vrStoppoint .SetCondition (m_strBreakpointExpr .c_str ());
285
287
286
- return UpdateStopPtInfo (rSessionInfo);
288
+ return UpdateStoppointInfo (rSessionInfo);
287
289
}
288
290
289
291
// Attributes:
@@ -294,8 +296,8 @@ class CMICmdCmdBreakCondition : public CMICmdBase {
294
296
// spec, we need to handle
295
297
// expressions not
296
298
// surrounded by quotes
297
- MIuint m_nMiStopPtId ;
298
- CMIUtilString m_strBrkPtExpr ;
299
+ MIuint m_nMiStoppointId ;
300
+ CMIUtilString m_strBreakpointExpr ;
299
301
};
300
302
301
303
// ++
@@ -326,10 +328,10 @@ class CMICmdCmdBreakWatch : public CMICmdBase {
326
328
private:
327
329
// Attributes:
328
330
private:
329
- const CMIUtilString m_constStrArgNamedAccessWatchPt ;
330
- const CMIUtilString m_constStrArgNamedReadWatchPt ;
331
+ const CMIUtilString m_constStrArgNamedAccessWatchpoint ;
332
+ const CMIUtilString m_constStrArgNamedReadWatchpoint ;
331
333
const CMIUtilString m_constStrArgNamedExpr;
332
334
333
- CMICmnLLDBDebugSessionInfo::SStopPtInfo m_stopPtInfo ;
334
- lldb::SBWatchpoint m_watchPt ;
335
+ CMICmnLLDBDebugSessionInfo::SStoppointInfo m_stoppointInfo ;
336
+ lldb::SBWatchpoint m_watchpoint ;
335
337
};
0 commit comments