parser-json-cov: introduce readEvents() helper method

... to make the code easier to extend.  No change in behavior intended.

Related: #222

Author: kdudka

src/lib/parser-json-cov.cc

@@ -23,6 +23,9 @@
 
 struct CovTreeDecoder::Private {
     KeyEventDigger              keDigger;
+    const pt::ptree            *pSrc;
+
+    void readEvents(Defect *def);
 };
 
 CovTreeDecoder::CovTreeDecoder():
@@ -32,15 +35,41 @@ CovTreeDecoder::CovTreeDecoder():
 
 CovTreeDecoder::~CovTreeDecoder() = default;
 
+void CovTreeDecoder::Private::readEvents(Defect *def)
+{
+    // count the events and allocate dst array
+    const pt::ptree &evtList = this->pSrc->get_child("events");
+    def->events.resize(evtList.size());
+
+    // decode events one by one
+    unsigned idx = 0;
+    pt::ptree::const_iterator it;
+    for (it = evtList.begin(); it != evtList.end(); ++it, ++idx) {
+        const pt::ptree &evtNode = it->second;
+        DefEvent &evt = def->events[idx];
+
+        evt.fileName    = valueOf<std::string>(evtNode, "filePathname");
+        evt.line        = valueOf<int>        (evtNode, "lineNumber");
+        evt.column      = valueOf<int>        (evtNode, "columnNumber");
+        evt.event       = valueOf<std::string>(evtNode, "eventTag");
+        evt.msg         = valueOf<std::string>(evtNode, "eventDescription");
+
+        if (evtNode.get<bool>("main"))
+            // this is a key event
+            // TODO: detect and report re-definitions of key events
+            def->keyEventIdx = idx;
+    }
+}
+
 bool CovTreeDecoder::readNode(Defect *def)
 {
     // move the iterator after we get the current position
-    const pt::ptree *pNode = this->nextNode();
-    if (!pNode)
+    d->pSrc = this->nextNode();
+    if (!d->pSrc)
         // failed initialization or EOF
         return false;
 
-    const pt::ptree &defNode = *pNode;
+    const pt::ptree &defNode = *d->pSrc;
 
     // read per-defect properties
     def->checker = defNode.get<std::string>("checkerName");
@@ -61,28 +90,8 @@ bool CovTreeDecoder::readNode(Defect *def)
             def->imp = 1;
     }
 
-    // count the events and allocate dst array
-    const pt::ptree &evtList = defNode.get_child("events");
-    def->events.resize(evtList.size());
-
-    // decode events one by one
-    unsigned idx = 0;
-    pt::ptree::const_iterator it;
-    for (it = evtList.begin(); it != evtList.end(); ++it, ++idx) {
-        const pt::ptree &evtNode = it->second;
-        DefEvent &evt = def->events[idx];
-
-        evt.fileName    = valueOf<std::string>(evtNode, "filePathname");
-        evt.line        = valueOf<int>        (evtNode, "lineNumber");
-        evt.column      = valueOf<int>        (evtNode, "columnNumber");
-        evt.event       = valueOf<std::string>(evtNode, "eventTag");
-        evt.msg         = valueOf<std::string>(evtNode, "eventDescription");
-
-        if (evtNode.get<bool>("main"))
-            // this is a key event
-            // TODO: detect and report re-definitions of key events
-            def->keyEventIdx = idx;
-    }
+    // read all events
+    d->readEvents(def);
 
     // initialize verbosity level of all events
     d->keDigger.initVerbosity(def);