Improve attempt logging

Prefix removed lines with "-" and added ones with "+"
antmicro · Oct 3, 2024 · 8fff990 · 8fff990
1 parent 762efb8
commit 8fff990
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/source/OneTimeRewriter.hpp b/source/OneTimeRewriter.hpp
@@ -111,7 +111,7 @@ class OneTimeRewriter : public SyntaxRewriter<TDerived> {
     void removeNode(const T& node, bool isNodeRemovable) {
         if (shouldRemove(node, isNodeRemovable)) {
             logType<T>();
-            std::cerr << node.toString() << "\n";
+            std::cerr << prefixLines(node.toString(), "-") << "\n";
             DERIVED->remove(node);
             rewritePoint = node.sourceRange();
             state = REGISTER_CHILD;
@@ -124,7 +124,7 @@ class OneTimeRewriter : public SyntaxRewriter<TDerived> {
             logType<TParent>();
             for (auto item : childList) {
                 DERIVED->remove(*item);
-                std::cerr << item->toString();
+                std::cerr << prefixLines(item->toString(), "-");
             }
             std::cerr << "\n";
             rewritePoint = parent.sourceRange();
@@ -135,9 +135,8 @@ class OneTimeRewriter : public SyntaxRewriter<TDerived> {
     template <typename TOrig, typename TNew>
     void replaceNode(const TOrig& originalNode, TNew& newNode) {
         logType<TOrig>();
-        // NOTE: this may look weird in multiline cases
-        std::cerr << "-" << originalNode.toString() << "\n";
-        std::cerr << "+" << newNode.toString() << "\n";
+        std::cerr << prefixLines(originalNode.toString(), "-") << "\n";
+        std::cerr << prefixLines(newNode.toString(), "+") << "\n";
         DERIVED->replace(originalNode, newNode);
         rewritePoint = originalNode.sourceRange();
         state = REGISTER_CHILD;

diff --git a/source/PairRemovers.hpp b/source/PairRemovers.hpp
@@ -51,7 +51,7 @@ class PairRemover : public SyntaxRewriter<PairRemover> {
             node.sourceRange() == searchedPair.first || node.sourceRange() == searchedPair.second;
         if (isNodeRemovable && found && node.sourceRange() != SourceRange::NoLocation) {
             logType<T>();
-            std::cerr << node.toString() << "\n";
+            std::cerr << prefixLines(node.toString(), "-") << "\n";
             remove(node);
         }
 

diff --git a/source/Utils.cpp b/source/Utils.cpp
@@ -271,3 +271,12 @@ bool test(std::shared_ptr<SyntaxTree>& tree, AttemptStats& info) {
     tmpFile << SyntaxPrinter::printFile(*tree);
     return test(info);
 }
+
+std::string prefixLines(const std::string& str, const std::string& linePrefix) {
+    std::istringstream sstream(str);
+    std::string line, out;
+    while(getline(sstream, line)) {
+        out += linePrefix + line + '\n';
+    }
+    return out;
+}
diff --git a/source/Utils.hpp b/source/Utils.hpp
@@ -77,3 +77,5 @@ class AttemptStats {
 
 bool test(AttemptStats& stats);
 bool test(std::shared_ptr<SyntaxTree>& tree, AttemptStats& info);
+
+std::string prefixLines(const std::string& str, const std::string& linePrefix);