Skip to content

Commit

Permalink
Merge pull request #276 from epasveer/275-editing-existing-commands-o…
Browse files Browse the repository at this point in the history
…n-a-breakpoint-is-broken

Fixed #275.
  • Loading branch information
epasveer authored Nov 29, 2024
2 parents 97cc2e9 + 1c9826d commit 9d7185a
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
types (non-structs).
* Source all files in ~/.config/seergdb/scripts/ on startup.
* Fixed regression handling ignoring of system header files.
* Fixed regression when adding commands to a breakpoint.

## [2.4] - 2024-03-18
* Changed main icon to a more license friendly one.
Expand Down
4 changes: 2 additions & 2 deletions src/SeerBreakpointsBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void SeerBreakpointsBrowserWidget::handleText (const QString& text) {
// Then morph that list into a map, delimited by a '='.
// Remove bookends.
//
QStringList items = Seer::parseCommaList(bkpt_text);
QStringList items = Seer::parseCommaList(bkpt_text, '[', ']');

QMap<QString,QString> keyValueMap = Seer::createKeyValueMap(items, '=');

Expand All @@ -147,7 +147,7 @@ void SeerBreakpointsBrowserWidget::handleText (const QString& text) {
QString cond_text = Seer::filterBookends(keyValueMap["cond"], '"', '"');
QString times_text = Seer::filterBookends(keyValueMap["times"], '"', '"');
QString ignore_text = Seer::filterBookends(keyValueMap["ignore"], '"', '"');
QString script_text = Seer::filterBookends(keyValueMap["script"], '{', '}');
QString script_text = Seer::filterBookends(keyValueMap["script"], '[', ']');
QString original_location_text = Seer::filterBookends(keyValueMap["original-location"], '"', '"');

// Only look for 'breakpoint' type break points.
Expand Down
5 changes: 5 additions & 0 deletions tests/helloqstring/breakpoints.seer
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
break -source /nas/erniep/Development/seer/tests/helloqstring/helloqstring.cpp -line 16
commands
print str
end
break -source /nas/erniep/Development/seer/tests/helloqstring/helloqstring.cpp -line 7
24 changes: 24 additions & 0 deletions tests/helloqstring/project.seer
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"seerproject": {
"executable": "helloqstring",
"postgdbcommands": [
""
],
"pregdbcommands": [
""
],
"startmode": {
"arguments": "one two three",
"breakinfunction": false,
"breakinfunctionname": "",
"breakinmain": true,
"breakpointsfile": "/nas/erniep/Development/seer/tests/helloqstring/breakpoints.seer",
"nobreak": false,
"nonstopmode": false,
"randomizestartaddress": false,
"showassemblytab": false
},
"symbolfile": "",
"workingdirectory": ""
}
}

0 comments on commit 9d7185a

Please sign in to comment.