diff --git a/src/SeerPrintpointsBrowserWidget.cpp b/src/SeerPrintpointsBrowserWidget.cpp index 4a0fa29..c2bb442 100644 --- a/src/SeerPrintpointsBrowserWidget.cpp +++ b/src/SeerPrintpointsBrowserWidget.cpp @@ -127,7 +127,7 @@ void SeerPrintpointsBrowserWidget::handleText (const QString& text) { QString file_text = Seer::parseFirst(bkpt_text, "file=", '"', '"', false); QString fullname_text = Seer::parseFirst(bkpt_text, "fullname=", '"', '"', false); QString line_text = Seer::parseFirst(bkpt_text, "line=", '"', '"', false); - QString script_text = Seer::parseFirst(bkpt_text, "script=", '{', '}', false); + QString script_text = Seer::parseFirst(bkpt_text, "script=", '[', ']', false); QString thread_groups_text = Seer::parseFirst(bkpt_text, "thread-groups=", '[', ']', false); QString cond_text = Seer::parseFirst(bkpt_text, "cond=", '"', '"', false); QString times_text = Seer::parseFirst(bkpt_text, "times=", '"', '"', false); @@ -139,7 +139,9 @@ void SeerPrintpointsBrowserWidget::handleText (const QString& text) { continue; } - script_text = Seer::filterBookends(Seer::parseCommaList(script_text, '{', '}'), '"', '"').join('\n'); + // Remove '"' bookends and then remove one level of escapes. + script_text = Seer::filterBookends (script_text, '"', '"'); + script_text = Seer::filterEscapes(script_text); // Add the level to the tree. QTreeWidgetItem* topItem = new QTreeWidgetItem; diff --git a/src/SeerPrintpointsBrowserWidget.ui b/src/SeerPrintpointsBrowserWidget.ui index 9905011..e9b88aa 100644 --- a/src/SeerPrintpointsBrowserWidget.ui +++ b/src/SeerPrintpointsBrowserWidget.ui @@ -72,7 +72,7 @@ - DPrintf + Command diff --git a/tests/hellodprintf/breakpoints.seer b/tests/hellodprintf/breakpoints.seer index a9d90e1..b5fa5ea 100644 --- a/tests/hellodprintf/breakpoints.seer +++ b/tests/hellodprintf/breakpoints.seer @@ -1,3 +1,2 @@ -dprintf -source /nas/erniep/Development/seer/tests/hellodprintf/hellodprintf.cpp -line 17,"Iteration %d Factorial %d\n",n,nfact -break -source /nas/erniep/Development/seer/tests/hellodprintf/hellodprintf.cpp -line 24 -dprintf -source hellodprintf_fortran.f -line 11,"Iteration %d Factorial %d\n",n,nfact +dprintf -source /nas/erniep/Development/seer/tests/hellodprintf/hellodprintf.cpp -line 44,"n=%d count=%d\n",n,count +break -source /nas/erniep/Development/seer/tests/hellodprintf/hellodprintf.cpp -line 53 diff --git a/tests/hellodprintf/logfile.txt b/tests/hellodprintf/logfile.txt index 5b13768..e69de29 100644 --- a/tests/hellodprintf/logfile.txt +++ b/tests/hellodprintf/logfile.txt @@ -1,4 +0,0 @@ -Hello -Hello -Hello -Hello