parser-json-gcc: read endLine/endColumn if available

Otherwise fallback to `caret`, which was the only field used so far.

Related: #136

Author: kdudka

src/lib/parser-json-gcc.cc

@@ -32,6 +32,56 @@ GccTreeDecoder::GccTreeDecoder():
 
 GccTreeDecoder::~GccTreeDecoder() = default;
 
+static bool gccReadLocRegion(
+        DefEvent           *pEvt,
+        const pt::ptree    &beg,
+        const pt::ptree    &end)
+{
+    // read file name
+    pEvt->fileName = valueOf<std::string>(beg, "file", "<unknown>");
+    if (pEvt->fileName != valueOf<std::string>(end, "file", "<unknown>"))
+        return false;
+
+    // read line
+    if ((pEvt->line = valueOf<int>(beg, "line"))) {
+        const int endLine = valueOf<int>(end, "line");
+        pEvt->vSize = diffNums(pEvt->line, endLine);
+    }
+
+    // read column
+    if ((pEvt->column = valueOf<int>(beg, "byte-column"))) {
+        const int endColumn = valueOf<int>(end, "byte-column");
+        pEvt->hSize = diffNums(pEvt->column, endColumn);
+    }
+
+    return true;
+}
+
+static void gccReadLocation(DefEvent *pEvt, const pt::ptree *locs)
+{
+    using std::string;
+
+    if (locs->empty())
+        return;
+
+    const pt::ptree &firstLoc = locs->begin()->second;
+
+    // try to read a region between start..finish
+    const pt::ptree *beg, *end;
+    if (findChildOf(&beg, firstLoc, "start")
+            && findChildOf(&end, firstLoc, "finish")
+            && gccReadLocRegion(pEvt, *beg, *end))
+        return;
+
+    // fallback to caret
+    const pt::ptree *caret;
+    if (findChildOf(&caret, firstLoc, "caret")) {
+        pEvt->fileName  = valueOf<string>(*caret, "file", "<unknown>");
+        pEvt->line      = valueOf<int>   (*caret, "line");
+        pEvt->column    = valueOf<int>   (*caret, "byte-column");
+    }
+}
+
 static bool gccReadEvent(DefEvent *pEvt, const pt::ptree &evtNode)
 {
     using std::string;
@@ -45,14 +95,8 @@ static bool gccReadEvent(DefEvent *pEvt, const pt::ptree &evtNode)
     // read location
     pEvt->fileName = "<unknown>";
     const pt::ptree *locs;
-    if (findChildOf(&locs, evtNode, "locations") && !locs->empty()) {
-        const pt::ptree *caret;
-        if (findChildOf(&caret, locs->begin()->second, "caret")) {
-            pEvt->fileName  = valueOf<string>(*caret, "file", "<unknown>");
-            pEvt->line      = valueOf<int>   (*caret, "line");
-            pEvt->column    = valueOf<int>   (*caret, "byte-column");
-        }
-    }
+    if (findChildOf(&locs, evtNode, "locations"))
+        gccReadLocation(pEvt, locs);
 
     // read message
     pEvt->msg = valueOf<string>(evtNode, "message", "<unknown>");

tests/csgrep/0094-gcc-json-stdout.txt

@@ -49,7 +49,8 @@
                 {
                     "file_name": "xxx.c",
                     "line": 11,
-                    "column": 15,
+                    "column": 11,
+                    "h_size": 7,
                     "event": "warning[-Wunused-parameter]",
                     "message": "unused parameter ‘argc’",
                     "verbosity_level": 0
@@ -65,7 +66,8 @@
                 {
                     "file_name": "xxx.c",
                     "line": 11,
-                    "column": 27,
+                    "column": 21,
+                    "h_size": 11,
                     "event": "warning[-Wunused-parameter]",
                     "message": "unused parameter ‘argv’",
                     "verbosity_level": 0