Changeset 780bfa

Timestamp:

Aug 13, 2025, 9:46:30 PM (5 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, Candidate_v1.7.1, stable

Children:

463bfb

Parents:

bcc29ca

git-author:

Frederik Heber <frederik.heber@…> (08/13/25 08:41:09)

git-committer:

Frederik Heber <frederik.heber@…> (08/13/25 21:46:30)

Message:

FIX: FormatParserStorage did not add parser instance on SetOutput.

• using the InputAction on an empty file would not write that file using the desired parser (judged from suffix) on exit because the respective was set as desired output but not instantiated (ParserPresent).

Files:

• src/Actions/ActionHistory.cpp (modified) (1 diff)
• src/Parser/FormatParserStorage.cpp (modified) (1 diff)
• tests/regression/Options/UndoMark/testsuite-options-undo-mark.at (modified) (1 diff)

src/Actions/ActionHistory.cpp

@@ -100 +100 @@
 void ActionHistory::setMark() {
   HistoryElement * const mark = &(history.back());
-  ASSERT( mark != NULL,
-      "ActionHistory::setMark() - must not push NULL as element");
+  if (mark == NULL) {
+    ELOG(2, "setMark - must not push NULL as element");
+    return;
+  }
   marked.push(mark);
 }
 
 void ActionHistory::unsetMark() {
-  marked.pop();
+  if (!marked.empty()) {
+    marked.pop();
+  } else {
+        ELOG(2, "unsetMark - stack is already empty.");
+  }
 }
 
 void ActionHistory::undoTillMark() {
   if (marked.empty()) {
-    undoLast();
+        ELOG(2, "There is no undo mark, not undoing anything.");
   } else {
     const HistoryElement * const mark = marked.top();

src/Parser/FormatParserStorage.cpp

@@ -181 +181 @@
   LOG(0, "STATUS: Adding " << ParserNames[type] << " type to output.");
   ParserDesiredOutputFormat[type] = true;
+  add(type);
 }
 

tests/regression/Options/UndoMark/testsuite-options-undo-mark.at

@@ -26 +26 @@
 # add an atom prior to undo-mark
 AT_CHECK([../../molecuilder -i test-simple-prior.conf --add-atom 1 --domain-position "5,5,5" --set-undo-mark 1 --undo-till-mark], 0, [stdout], [ignore])
-AT_CHECK([grep -c "ATOM" test-simple-prior.conf], 1, [ignore], [ignore])
+AT_CHECK([grep -q "^Ion_Type" test-simple-prior.conf], 0, [ignore], [ignore])
 
 # add an atom after to undo-mark
 AT_CHECK([../../molecuilder -i test-simple-after.conf --set-undo-mark 1 --add-atom 1 --domain-position "5,5,5" --undo-till-mark], 0, [stdout], [ignore])
-AT_CHECK([grep -c "ATOM" test-simple-after.conf], 1, [ignore], [ignore])
+AT_CHECK([grep -q "^Ion_Type" test-simple-after.conf], 1, [ignore], [ignore])
 
-# add an atom prior to undo-mark reset
-AT_CHECK([../../molecuilder  -i test-simple-prior-reset.conf --set-undo-mark 0 --add-atom 1 --domain-position "5,5,5" --select-all-atoms --undo-till-mark], 0, [stdout], [ignore])
-AT_CHECK([grep -c "ATOM" test-simple-prior-reset.conf], 1, [ignore], [ignore])
+# add an atom and select after undo-mark: both undone
+AT_CHECK([../../molecuilder  -i test-simple-two-undo.conf --set-undo-mark 1 --add-atom 1 --domain-position "5,5,5" --select-all-atoms --undo-till-mark], 0, [stdout], [ignore])
+AT_CHECK([grep -q "^Ion_Type" test-simple-two-undo.conf], 1, [ignore], [ignore])
 
-# input file with added atom
+# input file with added atom: undo all (input has no undo)
 AT_CHECK([../../molecuilder --set-undo-mark 1 --input hydrogen.xyz --add-atom 1 --domain-position "5,5,5" --undo-till-mark --select-all-atoms], 0, [stdout], [ignore])
 AT_CHECK([grep "0 atoms selected" stdout], 0, [ignore], [ignore])
 
-# input file with added atom
-AT_CHECK([../../molecuilder --input hydrogen.xyz --add-atom 1 --domain-position "5,5,5" --set-undo-mark 0 --undo-till-mark], 0, [stdout], [ignore])
-AT_CHECK([grep "Resetting mark" stdout], 0, [ignore], [ignore])
+# input file with added atom, then undo-mark: nothing undone
+AT_CHECK([../../molecuilder --input hydrogen.xyz --add-atom 1 --domain-position "5,5,5" --set-undo-mark 1 --undo-till-mark], 0, [stdout], [ignore])
+AT_CHECK([grep -q "H" hydrogen.xyz], 0, [ignore], [ignore])
 
 AT_CLEANUP