abstract-parser: introduce AbstractParser::readScanProps()

No change in behavior intended by this commit.

Author: kdudka

src/abstract-tree.hh

@@ -20,6 +20,8 @@
 #ifndef H_GUARD_ABSTRACT_TREE_H
 #define H_GUARD_ABSTRACT_TREE_H
 
+#include "abstract-parser.hh"       // for TScanProps
+
 #include <boost/property_tree/ptree.hpp>
 
 namespace pt = boost::property_tree;
@@ -31,6 +33,16 @@ class AbstractTreeDecoder {
     public:
         virtual ~AbstractTreeDecoder() { }
 
+        /// read scan properties if available
+        virtual void readScanProps(
+                TScanProps             *pDst,
+                const pt::ptree        *root)
+        {
+            (void) pDst;
+            (void) root;
+        }
+
+        /// locate the list of defects within the inner document format
         virtual void readRoot(
                 const pt::ptree       **pDefList,
                 const pt::ptree        *root)

src/json-parser.cc

@@ -30,6 +30,11 @@
 class SimpleTreeDecoder: public AbstractTreeDecoder {
     public:
         SimpleTreeDecoder(InStream &input);
+
+        virtual void readScanProps(
+                TScanProps             *pDst,
+                const pt::ptree        *root);
+
         virtual bool readNode(Defect *def, pt::ptree::const_iterator defIter);
 
     private:
@@ -104,13 +109,6 @@ JsonParser::JsonParser(InStream &input):
         // parse JSON
         read_json(input.str(), d->root);
 
-        // read scan properties if available (csdiff-native JSON format only)
-        pt::ptree emp;
-        pt::ptree scanNode =
-            d->root.get_child_optional("scan").get_value_or(emp);
-        for (const pt::ptree::value_type &item : scanNode)
-            d->scanProps[item.first] = item.second.data();
-
         // recognize inner format of the JSON document
         pt::ptree *node = nullptr;
         if (findChildOf(&node, d->root, "defects"))
@@ -122,6 +120,9 @@ JsonParser::JsonParser(InStream &input):
         else
             throw pt::ptree_error("unknown JSON format");
 
+        // read scan properties if available
+        d->decoder->readScanProps(&d->scanProps, &d->root);
+
         // process the root node
         d->decoder->readRoot(&d->defList, node);
 
@@ -235,6 +236,18 @@ void SimpleTreeDecoder::reportUnknownNodes(ENodeKind nk, const pt::ptree &node)
     }
 }
 
+void SimpleTreeDecoder::readScanProps(
+        TScanProps                 *pDst,
+        const pt::ptree            *root)
+{
+    const pt::ptree emp;
+    const pt::ptree &scanNode =
+        root->get_child_optional("scan").get_value_or(emp);
+
+    for (const pt::ptree::value_type &item : scanNode)
+        (*pDst)[item.first] = item.second.data();
+}
+
 bool SimpleTreeDecoder::readNode(
         Defect                      *def,
         pt::ptree::const_iterator    defIter)