Clean up loplugin:unnecessaryparen blacklist

* rsc/source/parser/rscyacc.cxx no longer exists

* writerfilter/source/rtftok/rtftokenizer.cxx appears to be just fine nowadays?

* sw/source/filter/html/htmltab.cxx used redundant parentheses around a comma
  operator in a while condition, and I see no reason not to remove them (the
  result requires a---reasonable---tweak to loplugin:commaoperator, though)

Change-Id: I451132c700b0ae5a43b03d704156484df897ad5c
Reviewed-on: https://gerrit.libreoffice.org/45213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

3 files changed, 9 insertions, 8 deletions

diff --git a/compilerplugins/clang/commaoperator.cxx b/compilerplugins/clang/commaoperator.cxx
index 4e8ea6153e12..0693fc83a07b 100644
--- a/compilerplugins/clang/commaoperator.cxx
+++ b/compilerplugins/clang/commaoperator.cxx
@@ -50,6 +50,14 @@ public:
         return ret;
     }
 
+    bool TraverseWhileStmt(WhileStmt * stmt) {
+        auto const saved1 = ignore1_;
+        ignore1_ = lookThroughExprWithCleanups(stmt->getCond());
+        auto const ret = RecursiveASTVisitor::TraverseWhileStmt(stmt);
+        ignore1_ = saved1;
+        return ret;
+    }
+
     bool TraverseParenExpr(ParenExpr * expr) {
         auto const saved1 = ignore1_;
         ignore1_ = expr->getSubExpr();
diff --git a/compilerplugins/clang/test/commaoperator.cxx b/compilerplugins/clang/test/commaoperator.cxx
index 199dcf41c243..6abe963ae7a9 100644
--- a/compilerplugins/clang/test/commaoperator.cxx
+++ b/compilerplugins/clang/test/commaoperator.cxx
@@ -22,6 +22,7 @@ int main() {
     S s;
     (s = S(), s = S(), s = S());
     for (s = S(), f(); f(); s = S(), f()) {}
+    while (s = S(), f()) {}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unnecessaryparen.cxx b/compilerplugins/clang/unnecessaryparen.cxx
index a7d3d26e6591..3a97c0d39456 100644
--- a/compilerplugins/clang/unnecessaryparen.cxx
+++ b/compilerplugins/clang/unnecessaryparen.cxx
@@ -67,14 +67,6 @@ public:
              return;
         if (loplugin::isSamePathname(fn, WORKDIR "/YaccTarget/idlc/source/parser.cxx"))
              return;
-        if (loplugin::isSamePathname(fn, WORKDIR "/YaccTarget/rsc/source/parser/rscyacc.cxx"))
-             return;
-
-        // TODO yuck, comma operator at work
-        if (loplugin::isSamePathname(fn, SRCDIR "/writerfilter/source/rtftok/rtftokenizer.cxx"))
-             return;
-        if (loplugin::isSamePathname(fn, SRCDIR "/sw/source/filter/html/htmltab.cxx"))
-             return;
 
         TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
     }