parser-common: introduce the parse_int() helper

... to deduplicate its code in parsers

Author: kdudka

CMakeLists.txt

@@ -38,6 +38,7 @@ add_library(cs STATIC
     instream.cc
     json-parser.cc
     json-writer.cc
+    parser-common.cc
     shared-string.cc
     version.cc
 )

csparser.cc

@@ -29,7 +29,6 @@
 #include <sstream>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/regex.hpp>
 
 class LineReader {
@@ -185,20 +184,10 @@ EToken ErrFileLexer::readNext() {
     evt_.msg        = sm[/* msg   */ 5];
 
     // parse line number
-    try {
-        evt_.line = boost::lexical_cast<int>(sm[/* line */ 2]);
-    }
-    catch (boost::bad_lexical_cast &) {
-        evt_.line = 0;
-    }
+    evt_.line = parse_int(sm[/* line */ 2]);
 
     // parse column number
-    try {
-        evt_.column = boost::lexical_cast<int>(sm[/* col */ 3]);
-    }
-    catch (boost::bad_lexical_cast &) {
-        evt_.column = 0;
-    }
+    evt_.column = parse_int(sm[/* col */ 3]);
 
     return T_EVENT;
 }

gcc-parser.cc

@@ -24,7 +24,6 @@
 #include <algorithm>
 
 #include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/regex.hpp>
 
 enum EToken {
@@ -156,20 +155,10 @@ EToken Tokenizer::readNext(DefEvent *pEvt) {
     pEvt->fileName    = sm[/* file */ 1];
 
     // parse line number
-    try {
-        pEvt->line = boost::lexical_cast<int>(sm[/* line */ 2]);
-    }
-    catch (boost::bad_lexical_cast &) {
-        pEvt->line = 0;
-    }
+    pEvt->line = parse_int(sm[/* line */ 2]);
 
     // parse column number
-    try {
-        pEvt->column = boost::lexical_cast<int>(sm[/* col */ 3]);
-    }
-    catch (boost::bad_lexical_cast &) {
-        pEvt->column = 0;
-    }
+    pEvt->column = parse_int(sm[/* col */ 3]);
 
     return tok;
 }
@@ -574,14 +563,8 @@ void PostProcessor::transGccAnal(Defect *pDef) {
 
     // pick CWE number if available
     const std::string rawMsg = sm[/* msg */ 1];
-    if (boost::regex_match(rawMsg, sm, reGccAnalCwe_)) {
-        try {
-            pDef->cwe = boost::lexical_cast<int>(sm[/* cwe */ 1]);
-        }
-        catch (boost::bad_lexical_cast &) {
-            pDef->cwe = 0;
-        }
-    }
+    if (boost::regex_match(rawMsg, sm, reGccAnalCwe_))
+        pDef->cwe = parse_int(sm[/* cwe */ 1]);
 }
 
 void PostProcessor::apply(Defect *pDef) {

parser-common.cc

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2020 Red Hat, Inc.
+ *
+ * This file is part of csdiff.
+ *
+ * csdiff is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * csdiff is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with csdiff.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "parser-common.hh"
+
+#include <boost/lexical_cast.hpp>
+
+int parse_int(const std::string &str, const int fallback) {
+    try {
+        return boost::lexical_cast<int>(str);
+    }
+    catch (boost::bad_lexical_cast &) {
+        return fallback;
+    }
+}

parser-common.hh

@@ -20,8 +20,12 @@
 #ifndef H_GUARD_PARSER_COMMON_H
 #define H_GUARD_PARSER_COMMON_H
 
+#include <string>
+
 #define RE_EVENT_GCC "(?:(?:(?:fatal|internal) )?[a-z][\\[\\]A-Za-z0-9_-]+)"
 #define RE_EVENT_PROSPECTOR "(?:[A-Z]+[0-9]+\\[[a-z0-9-]+\\])"
 #define RE_EVENT RE_EVENT_GCC "|" RE_EVENT_PROSPECTOR
 
+int parse_int(const std::string &, int fallback = 0);
+
 #endif /* H_GUARD_PARSER_COMMON_H */