[#81064] Bump clang-format, fix formatting

Signed-off-by: Artur Bieniek <abieniek@internships.antmicro.com>

Author: ArturBieniek4

.ci.yml

@@ -8,7 +8,7 @@ test-and-lint:
   image: "verilator/verilator:v5.016"
   tags: ['ace-x86_64']
   script:
-    - apt-get -qqy update && apt-get -qqy --no-install-recommends install cmake build-essential git ca-certificates python3 clang-format-14 mold ninja-build shellcheck
+    - apt-get -qqy update && apt-get -qqy --no-install-recommends install cmake build-essential git ca-certificates python3 clang-format-15 mold ninja-build shellcheck
     - cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -G Ninja -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=mold"
     - cmake --build build -j"$(nproc)"
     - PATH="$PWD/build:$PWD/scripts:$PATH" && make -j"$(nproc)" -O -k --no-print-directory -f check.mk

.clang-format

@@ -3,3 +3,4 @@ BasedOnStyle: Chromium
 ColumnLimit:  100
 IndentWidth: 4
 AlignEscapedNewlines: DontAlign
+InsertBraces: true

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install deps
-        run: apt-get -qqy update && apt-get -qqy --no-install-recommends install cmake build-essential git ca-certificates python3 clang-format-14 shellcheck
+        run: apt-get -qqy update && apt-get -qqy --no-install-recommends install cmake build-essential git ca-certificates python3 clang-format-15 shellcheck
       - name: Build
         run: |
           cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo

check.mk

@@ -12,7 +12,7 @@ autofix: autofmt shellcheck_autofix
 
 .PHONY: autofmt
 autofmt:
-	clang-format-14 -i source/*.cpp source/*.hpp
+	clang-format-15 -i source/*.cpp source/*.hpp
 
 .PHONY: test
 test:
@@ -25,7 +25,7 @@ lint: fmt_check shellcheck
 fmt_check:
 	FMT_FAILED=0; \
 	for i in source/*.cpp source/*.hpp; do \
-	  diff "$$i" <(clang-format-14 "$$i")  --label "original $$i" --label "formatted $$i" --color=always -u || FMT_FAILED=1; \
+	  diff "$$i" <(clang-format-15 "$$i")  --label "original $$i" --label "formatted $$i" --color=always -u || FMT_FAILED=1; \
 	done; \
 	exit "$$FMT_FAILED"
 	@echo # blank line for consistency

source/OneTimeRewriter.hpp

@@ -44,11 +44,13 @@ class OneTimeRewriter : public SyntaxRewriter<TDerived> {
     void visitDefault(T&& node) {
         for (uint32_t i = 0; i < node.getChildCount(); i++) {
             auto child = node.childNode(i);
-            if (child)
+            if (child) {
                 child->visit(*DERIVED, node.isChildOptional(i));
+            }
         }
-        if (node.getChildCount() == 0)  // leaf node
+        if (node.getChildCount() == 0) {  // leaf node
             node.visit(*DERIVED, true);
+        }
     }
 
     // Do some state bookkeeping, try to call type-specific handler, and visit node's children.

source/PairRemovers.cpp

@@ -54,8 +54,9 @@ class PortMapper : public ASTVisitor<PortMapper, true, true, true> {
     void handle(const InstanceSymbol& instance) {
         std::unordered_set<SourceRange> connectedPortDefs;
         for (auto conn : instance.getPortConnections()) {
-            if (!conn)
+            if (!conn) {
                 continue;
+            }
 
             SourceRange defLocation = getPortDefLoc(&conn->port);
             SourceRange useLocation = SourceRange::NoLocation;

source/PairRemovers.hpp

@@ -35,8 +35,9 @@ class PairRemover : public SyntaxRewriter<PairRemover> {
     void visitDefault(T&& node) {
         for (uint32_t i = 0; i < node.getChildCount(); i++) {
             auto child = node.childNode(i);
-            if (child)
+            if (child) {
                 child->visit(*this, node.isChildOptional(i));
+            }
         }
     }
 

source/SvBugpoint.cpp

@@ -102,15 +102,13 @@ bool SvBugpoint::test(std::shared_ptr<SyntaxTree>& tree, AttemptStats& stats) {
 }
 
 char* getNextDelim(char* line, char* end) {
-    if (line > end)
+    if (line > end) {
         return nullptr;
+    }
     while (line < end) {
-        if (*line == '\n')
-            return line;
-        if (*line == '\r')
-            return line;
-        if (*line == '\0')
+        if (*line == '\n' || *line == '\r' || *line == '\0') {
             return line;
+        }
         line++;
     }
     return end;
@@ -460,16 +458,18 @@ void SvBugpoint::processCommandFiles(fs::path file) {
 void SvBugpoint::parseCommandLine(std::string_view argList,
                                   CommandLine::ParseOptions parseOptions) {
     if (!cmdLine.parse(argList, parseOptions)) {
-        for (auto& err : cmdLine.getErrors())
+        for (auto& err : cmdLine.getErrors()) {
             std::cerr << err << std::endl;
+        }
         exit(1);
     }
 }
 
 void SvBugpoint::parseCommandLine(int argc, char** argv) {
     if (!cmdLine.parse(argc, argv)) {
-        for (auto& err : cmdLine.getErrors())
+        for (auto& err : cmdLine.getErrors()) {
             std::cerr << err << std::endl;
+        }
         exit(1);
     }
 }

source/Utils.cpp

@@ -59,8 +59,9 @@ class TreePrinter : public SyntaxVisitor<TDerived> {
     }
 
     void printIndent() {
-        for (int i = 0; i < indentLevel; ++i)
+        for (int i = 0; i < indentLevel; ++i) {
             out << " ";
+        }
     }
 
     template <typename T>
@@ -110,8 +111,9 @@ class AstPrinter : public ASTVisitor<AstPrinter, true, true, true> {
         out << "node: " << STRINGIZE_NODE_TYPE(T) << " " << toString(node.kind) << " "
             << "\n";
         if constexpr (requires { node.getSyntax(); }) {
-            if (node.getSyntax())
+            if (node.getSyntax()) {
                 out << node.getSyntax()->toString() << "\n";
+            }
         }
         visitDefault(node);
     }
@@ -126,12 +128,13 @@ void printAst(const RootSymbol& root, std::ostream& file) {
 }
 
 std::string toString(SourceRange sourceRange) {
-    if (sourceRange == SourceRange::NoLocation)
+    if (sourceRange == SourceRange::NoLocation) {
         return "NO_LOCATION";
-    else
+    } else {
         return "buffer:" + std::to_string(sourceRange.start().buffer().getId()) +
                ", offsetStart: " + std::to_string(sourceRange.start().offset()) +
                ", offsetEnd: " + std::to_string(sourceRange.end().offset());
+    }
 }
 
 void copyFile(const std::string& from, const std::string& to) {