anyOf

Author: pifopi

.github/workflows/cpp-ci-serial-programs-base.yml

@@ -133,21 +133,23 @@ jobs:
 
         cat << 'EOF' > query.txt
         set output dump
-        match invocation(
-          isExpansionInFileMatching("SerialPrograms/"),
-          hasDeclaration(cxxConstructorDecl(ofClass(hasName("std::filesystem::path")))),
-          hasArgument(0, hasType(asString("std::string")))
-        )
-        match cxxConstructExpr(
-          isExpansionInFileMatching("SerialPrograms/"),
-          hasDeclaration(cxxConstructorDecl(ofClass(hasName("ImageViewRGB32")))),
-          hasArgument(0, hasType(rValueReferenceType(pointee(hasType(hasName("VideoSnapshot")))))),
-          unless(hasAncestor(functionDecl(isInline())))
+        match anyOf(
+          invocation(
+            isExpansionInFileMatching("SerialPrograms/"),
+            hasDeclaration(cxxConstructorDecl(ofClass(hasName("std::filesystem::path")))),
+            hasArgument(0, hasType(asString("std::string")))
+          ),
+          cxxConstructExpr(
+            isExpansionInFileMatching("SerialPrograms/"),
+            hasDeclaration(cxxConstructorDecl(ofClass(hasName("ImageViewRGB32")))),
+            hasArgument(0, hasType(rValueReferenceType(pointee(hasType(hasName("VideoSnapshot")))))),
+            unless(hasAncestor(functionDecl(isInline())))
+          )
         )
         EOF
 
         files=$(jq -r '.[].file' SerialPrograms/bin/compile_commands.json)
-        echo "$files" | xargs --max-args=50 clang-query -p SerialPrograms/bin/ -f query.txt >> output.txt || true
+        echo "$files" | xargs --max-args=50 clang-query -p SerialPrograms/bin/ -f query.txt >> output.txt
         cat output.txt
         if grep "Match #" output.txt; then
           echo "::error Forbidden code detected. It can be"