json: propagate per-checker language attribute

Author: kdudka

defect.hh

@@ -92,6 +92,7 @@ struct Defect {
     int                     cwe;            ///< CWE number, 0 means unused
     int                     defectId;       ///< used only by the JSON format
     std::string             function;       ///< used only by the JSON format
+    std::string             language;       ///< used only by the JSON format
 
     Defect():
         keyEventIdx(0U),

json-parser.cc

@@ -249,6 +249,7 @@ void SimpleTreeDecoder::readNode(
     def->defectId = valueOf<int>        (defNode, "defect_id", 0);
     def->cwe      = valueOf<int>        (defNode, "cwe"      , 0);
     def->function = valueOf<std::string>(defNode, "function", "");
+    def->language = valueOf<std::string>(defNode, "language", "");
 
     if (defNode.not_found() == defNode.find("key_event_idx")) {
         // key event not specified, try to guess it
@@ -281,9 +282,9 @@ void CovTreeDecoder::readNode(
     (*def) = Defect();
 
     // read per-defect properties
-    // TODO: read/propagate more properties from the Coverity JSON format
     def->checker = defNode.get<std::string>("checkerName");
     def->function = valueOf<std::string>(defNode, "functionDisplayName", "");
+    def->language = valueOf<std::string>(defNode, "code-language", "");
 
     // read CWE if available
     const pt::ptree *checkerProps;

json-writer.cc

@@ -94,6 +94,8 @@ void appendDefectNode(PTree &dst, const Defect &def) {
         defNode.put<int>("cwe", def.cwe);
     if (!def.function.empty())
         defNode.put<string>("function", def.function);
+    if (!def.language.empty())
+        defNode.put<string>("language", def.language);
 
     defNode.put<int>("key_event_idx", def.keyEventIdx);
     defNode.put_child("events", evtList);

tests/CMakeLists.txt

@@ -177,6 +177,7 @@ test_csgrep(csgrep      "57-gcc-parser-gcc-analyzer-curl")
 test_csgrep(csgrep      "58-csparser-gcc-analyzer-curl")
 test_csgrep(csgrep      "59-json-parser-cov-v7-cwe"   )
 test_csgrep(csgrep      "60-gcc-parser-cppcheck-cwe"  )
+test_csgrep(csgrep      "61-json-parser-cov-v7-lang"  )
 test_csparser(csparser-5.8                          00)
 test_csparser(csparser-5.8                          01)
 test_csparser(csparser-5.8                          02)

tests/csgrep/61-json-parser-cov-v7-lang-args.txt

@@ -0,0 +1 @@
+--mode=json