abstract-filter: drop existing ctx lines from defect

... before appending new context lines

Author: kdudka

abstract-filter.cc

@@ -99,6 +99,20 @@ void EventPrunner::handleDef(const Defect &defOrig) {
 // /////////////////////////////////////////////////////////////////////////////
 // implementation of CtxEmbedder
 
+void dropCtxLines(TEvtList *pEvtList) {
+    static CtxEventDetector detector;
+
+    TEvtList dst;
+    BOOST_FOREACH(const DefEvent &evt, *pEvtList) {
+        if (detector.isAnyCtxLine(evt))
+            continue;
+
+        dst.push_back(evt);
+    }
+
+    pEvtList->swap(dst);
+}
+
 void appendCtxLines(
         TEvtList       *pDst,
         std::istream   &inStr,
@@ -156,6 +170,7 @@ void CtxEmbedder::handleDef(const Defect &defOrig) {
 
     // clone defOrig and append the context lines
     Defect def(defOrig);
+    dropCtxLines(&def.events);
     appendCtxLines(&def.events, fstr, evt.line, ctxLines_ - 1);
 
     // close the file stream and forward the result

abstract-writer.cc

@@ -23,6 +23,8 @@
 #include "instream.hh"
 #include "json-writer.hh"
 
+#include <boost/regex.hpp>
+
 // /////////////////////////////////////////////////////////////////////////////
 // implementation of AbstractWriter
 
@@ -100,3 +102,30 @@ AbstractWriter* createWriter(
 
     return writer;
 }
+
+
+// /////////////////////////////////////////////////////////////////////////////
+// implementation of CtxEventDetector
+
+struct CtxEventDetector::Private {
+    boost::regex reAnyCtxLine;
+    
+    Private():
+        reAnyCtxLine("^ *[0-9]+\\|(?:->)? .*$")
+    {
+    }
+};
+
+CtxEventDetector::CtxEventDetector():
+    d(new Private)
+{
+}
+
+CtxEventDetector::~CtxEventDetector() {
+    delete d;
+}
+
+bool CtxEventDetector::isAnyCtxLine(const DefEvent &evt) const {
+    return (evt.event == "#")
+        && boost::regex_match(evt.msg, d->reAnyCtxLine);
+}

abstract-writer.hh

@@ -72,4 +72,16 @@ AbstractWriter* createWriter(
         const EColorMode            cm        = CM_AUTO,
         const TScanProps           &scanProps = TScanProps());
 
+class CtxEventDetector {
+    public:
+        CtxEventDetector();
+        ~CtxEventDetector();
+
+        bool isAnyCtxLine(const DefEvent &evt) const;
+
+    private:
+        struct Private;
+        Private *d;
+};
+
 #endif /* H_GUARD_ABSTRACT_WRITER_H */