parseRange

Author: danmar

lib/suppressions.cpp

@@ -736,19 +736,7 @@ std::list<SuppressionList::Suppression> polyspace::Parser::parse(const std::stri
             break;
 
         // optional range
-        pos = comment.find_first_not_of(" \t", pos);
-        if (pos >= comment.size())
-            break;
-        int rangeValue = 0;
-        if (comment[pos] == '+') {
-            const std::string::size_type posRangeStart = pos + 1;
-            pos = comment.find_first_of(" \t", posRangeStart);
-            if (pos > comment.size())
-                break;
-            const std::string range = comment.substr(posRangeStart, pos-posRangeStart);
-            // TODO check that range is an integer
-            rangeValue = std::stoi(range);
-        }
+        const int rangeValue = parseRange(comment, pos);
 
         // ids..
         const std::set<std::string> ids = parseIds(comment, pos);
@@ -802,6 +790,27 @@ std::list<SuppressionList::Suppression> polyspace::Parser::parse(const std::stri
     return ret;
 }
 
+
+int polyspace::Parser::parseRange(const std::string& comment, std::string::size_type& pos) {
+    pos = comment.find_first_not_of(" \t", pos);
+    if (pos >= comment.size())
+        return 0;
+    if (comment[pos] != '+')
+        return 0;
+    const std::string::size_type startpos = pos + 1;
+    std::string::size_type endpos = comment.find_first_of(" \t", startpos);
+    if (endpos > comment.size())
+        return 0;
+    const std::string range = comment.substr(startpos, endpos-startpos);
+    try {
+        int ret = std::stoi(range);
+        pos = endpos;
+        return ret;
+    } catch (const std::invalid_argument &) {
+    }
+    return 0;
+}
+
 std::vector<std::pair<std::string, std::string>> polyspace::Parser::parseFamilyRules(const std::string& comment, std::string::size_type& pos) {
     std::vector<std::pair<std::string, std::string>> fr;
     std::string family;

lib/suppressions.h

@@ -310,13 +310,13 @@ namespace polyspace {
 
         std::list<SuppressionList::Suppression> parse(const std::string &comment, int line, const std::string &filename);
 
+        static int parseRange(const std::string& comment, std::string::size_type& pos);
         static std::vector<std::pair<std::string, std::string>> parseFamilyRules(const std::string& comment, std::string::size_type& pos);
 
     private:
         std::set<std::string> parseIds(const std::string& comment, std::string::size_type& pos) const;
 
         static CommentKind parseKind(const std::string& token, std::string::size_type& pos);
-        int parseRange();
 
         std::map<std::string, std::string> mFamilyMap;
     };

test/testsuppressions.cpp

@@ -121,6 +121,7 @@ class TestSuppressions : public TestFixture {
 
         TEST_CASE(suppressionWildcard);
 
+        TEST_CASE(polyspaceParseRange);
         TEST_CASE(polyspaceParseIds);
 
         TEST_CASE(polyspaceMisraC2012);
@@ -1928,6 +1929,36 @@ class TestSuppressions : public TestFixture {
         return ret.empty() ? ret : ret.substr(1);
     }
 
+    void polyspaceParseRange() const {
+        std::string::size_type pos;
+
+        // Happy case
+        pos = 0;
+        ASSERT_EQUALS(12, polyspace::Parser::parseRange(" +12 ",pos));
+        ASSERT_EQUALS(4U, pos);
+
+        // Invalid range => pos will point at the token
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" ",pos));
+        ASSERT_EQUALS(std::string::npos, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" test ",pos));
+        ASSERT_EQUALS(1U, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" +",pos));
+        ASSERT_EQUALS(1U, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" +12",pos));
+        ASSERT_EQUALS(1U, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" +A ",pos));
+        ASSERT_EQUALS(1U, pos);
+    }
+
     void polyspaceParseIds() const {
         ASSERT_EQUALS("test:12", polyspaceParseIdsResults("abc test:12",3));
         ASSERT_EQUALS("test:12", polyspaceParseIdsResults("abc test:12 [12]",3));