2

Author: danmar

lib/preprocessor.cpp

@@ -208,26 +208,25 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
             continue;
         }
 
-        if (polyspace::isPolyspaceComment(tok->str())) {
-            polyspaceParser.parse(tok->str(), tok->location.line, getRelativeFilename(tokens, tok, settings));
-            continue;
-        }
-
         std::list<SuppressionList::Suppression> inlineSuppressions;
-        if (!parseInlineSuppressionCommentToken(tokens, tok, inlineSuppressions, bad))
-            continue;
+        if (polyspace::isPolyspaceComment(tok->str())) {
+            inlineSuppressions = polyspaceParser.parse(tok->str(), tok->location.line, getRelativeFilename(tokens, tok, settings));
+        } else {
+            if (!parseInlineSuppressionCommentToken(tokens, tok, inlineSuppressions, bad))
+                continue;
 
-        if (!sameline(tok->previous, tok)) {
-            // find code after comment..
-            if (tok->next) {
-                tok = tok->next;
+            if (!sameline(tok->previous, tok)) {
+                // find code after comment..
+                if (tok->next) {
+                    tok = tok->next;
 
-                while (tok->comment) {
-                    parseInlineSuppressionCommentToken(tokens, tok, inlineSuppressions, bad);
-                    if (tok->next) {
-                        tok = tok->next;
-                    } else {
-                        break;
+                    while (tok->comment) {
+                        parseInlineSuppressionCommentToken(tokens, tok, inlineSuppressions, bad);
+                        if (tok->next) {
+                            tok = tok->next;
+                        } else {
+                            break;
+                        }
                     }
                 }
             }
@@ -317,8 +316,6 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
     for (const SuppressionList::Suppression & suppr: inlineSuppressionsBlockBegin)
         // cppcheck-suppress useStlAlgorithm
         bad.emplace_back(suppr.fileName, suppr.lineNumber, 0, "Suppress Begin: No matching end"); // TODO: set column
-
-    polyspaceParser.collect(suppressions);
 }
 
 void Preprocessor::inlineSuppressions(SuppressionList &suppressions)