Updated and reformatted to clang-format-18

bkryza · bkryza · commit 0690146897a4 · 2024-10-01T12:20:20.000+02:00
diff --git a/Makefile b/Makefile
@@ -182,11 +182,11 @@ init_compile_commands: debug
 
 .PHONY: clang-format
 clang-format:
-	docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.4
+	docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.5
 
 .PHONY: format
 format:
-	docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.4
+	docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.5
 
 .PHONY: debug_tidy
 tidy: debug_tidy
diff --git a/src/class_diagram/generators/mermaid/class_diagram_generator.cc b/src/class_diagram/generators/mermaid/class_diagram_generator.cc
@@ -308,8 +308,7 @@ void generator::generate_member(
 
 void generator::generate(const concept_ &c, std::ostream &ostr) const
 {
-    ostr << indent(1) << "class"
-         << " " << c.alias();
+    ostr << indent(1) << "class" << " " << c.alias();
 
     ostr << " {" << '\n';
     ostr << indent(2) << "<<concept>>\n";
diff --git a/src/class_diagram/generators/plantuml/class_diagram_generator.cc b/src/class_diagram/generators/plantuml/class_diagram_generator.cc
@@ -99,11 +99,9 @@ void generator::generate_alias(const enum_ &e, std::ostream &ostr) const
     print_debug(e, ostr);
 
     if (!config().generate_fully_qualified_name())
-        ostr << "enum"
-             << " \"" << e.name();
+        ostr << "enum" << " \"" << e.name();
     else
-        ostr << "enum"
-             << " \"" << render_name(e.full_name());
+        ostr << "enum" << " \"" << render_name(e.full_name());
 
     ostr << "\" as " << e.alias() << '\n';
 
@@ -116,11 +114,9 @@ void generator::generate_alias(const concept_ &c, std::ostream &ostr) const
     print_debug(c, ostr);
 
     if (!config().generate_fully_qualified_name())
-        ostr << "class"
-             << " \"" << c.full_name_no_ns();
+        ostr << "class" << " \"" << c.full_name_no_ns();
     else
-        ostr << "class"
-             << " \"" << render_name(c.full_name());
+        ostr << "class" << " \"" << render_name(c.full_name());
 
     ostr << "\" as " << c.alias() << '\n';
 
@@ -155,8 +151,7 @@ void generator::generate(const class_ &c, std::ostream &ostr) const
     ostr << class_type << " " << c.alias();
 
     if (c.is_union())
-        ostr << " "
-             << "<<union>>";
+        ostr << " " << "<<union>>";
 
     if (config().generate_links) {
         common_generator<diagram_config, diagram_model>::generate_link(ostr, c);
diff --git a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
@@ -445,8 +445,7 @@ void generator::generate_participant(
         common::ensure_lambda_type_is_relative(config(), participant_name);
 
         ostr << indent(1) << "participant " << class_participant.alias()
-             << " as "
-             << "<< ObjC Interface >><br>"
+             << " as " << "<< ObjC Interface >><br>"
              << render_participant_name(participant_name);
 
         ostr << '\n';
@@ -699,8 +698,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                     ostr << indent(1) << from_alias << " "
                          << common::generators::mermaid::to_mermaid(
                                 message_t::kReturn)
-                         << " *"
-                         << " : ";
+                         << " *" << " : ";
 
                     if (config().generate_return_types())
                         ostr << from.value().return_type();
diff --git a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
@@ -597,8 +597,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                 from.value().type_name() == "objc_method" ||
                 config().combine_free_functions_into_file_participants()) {
                 generate_participant(ostr, *from_activity_id);
-                ostr << "[->"
-                     << " " << generate_alias(from.value()) << " : "
+                ostr << "[->" << " " << generate_alias(from.value()) << " : "
                      << from.value().message_name(
                             select_method_arguments_render_mode())
                      << '\n';
@@ -638,8 +637,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                 from.value().type_name() == "objc_method" ||
                 config().combine_free_functions_into_file_participants()) {
                 generate_participant(ostr, from_activity_id);
-                ostr << "[->"
-                     << " " << generate_alias(from.value()) << " : "
+                ostr << "[->" << " " << generate_alias(from.value()) << " : "
                      << from.value().message_name(
                             select_method_arguments_render_mode())
                      << '\n';
@@ -704,8 +702,7 @@ void generator::generate_diagram(std::ostream &ostr) const
             if (from.value().type_name() == "method" ||
                 from.value().type_name() == "objc_method" ||
                 config().combine_free_functions_into_file_participants()) {
-                ostr << "[->"
-                     << " " << from_alias << " : "
+                ostr << "[->" << " " << from_alias << " : "
                      << from.value().message_name(render_mode) << '\n';
             }
 
@@ -718,8 +715,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                 config().combine_free_functions_into_file_participants()) {
 
                 if (!from.value().is_void()) {
-                    ostr << "[<--"
-                         << " " << from_alias;
+                    ostr << "[<--" << " " << from_alias;
 
                     if (config().generate_return_types())
                         ostr << " : //" << from.value().return_type() << "//";
diff --git a/tests/t00044/t00044.cc b/tests/t00044/t00044.cc
@@ -25,8 +25,8 @@ template <typename Ret, typename... Args, typename A>
 struct signal_handler<Ret(Args...), A> { };
 
 template <typename Ret, typename... Args, typename A>
-sink(signal_handler<Ret(Args...), A> &)
-    -> sink<signal_handler<Ret(Args...), A>>;
+sink(
+    signal_handler<Ret(Args...), A> &) -> sink<signal_handler<Ret(Args...), A>>;
 
 signal_handler<void(int), bool> int_handler;
 
diff --git a/tests/t00056/t00056.cc b/tests/t00056/t00056.cc
@@ -18,25 +18,20 @@ concept max_four_bytes = sizeof(T) <= 4;
 // Simple requirement
 template <typename T>
 concept iterable = requires(T container) {
-                       container.begin();
-                       container.end();
-                   };
+    container.begin();
+    container.end();
+};
 
 // Type requirement
 template <typename T>
 concept has_value_type = requires { typename T::value_type; };
 
 template <typename T>
-concept convertible_to_string =
-    max_four_bytes<T> && requires(T s) {
-                             std::string{s};
-                             {
-                                 std::to_string(s)
-                             } noexcept;
-                             {
-                                 std::to_string(s)
-                                 } -> std::same_as<std::string>;
-                         };
+concept convertible_to_string = max_four_bytes<T> && requires(T s) {
+    std::string{s};
+    { std::to_string(s) } noexcept;
+    { std::to_string(s) } -> std::same_as<std::string>;
+};
 
 // Compound requirement
 // ...
@@ -64,9 +59,9 @@ struct B {
 // Anonymous concept requirement (TODO)
 template <convertible_to_string T>
     requires requires(T t) {
-                 --t;
-                 t--;
-             }
+        --t;
+        t--;
+    }
 struct C {
     T c;
 };
diff --git a/tests/t00059/t00059.cc b/tests/t00059/t00059.cc
@@ -5,9 +5,9 @@ namespace t00059 {
 
 template <typename T>
 concept fruit_c = requires(T t) {
-                      T{};
-                      t.get_name();
-                  };
+    T{};
+    t.get_name();
+};
 
 template <typename T>
 concept apple_c = fruit_c<T> && requires(T t) { t.get_sweetness(); };
diff --git a/tests/t00062/t00062.cc b/tests/t00062/t00062.cc
@@ -80,7 +80,9 @@ template <> struct A<char[1000]> {
     std::vector<char> n;
 };
 
-template <int K, int L, int M> struct A<char[K][L][M]> { char klm[K][L][M]; };
+template <int K, int L, int M> struct A<char[K][L][M]> {
+    char klm[K][L][M];
+};
 
 template <typename U> struct A<U(...)> {
     bool u;
diff --git a/tests/t00065/module2/concepts/concepts.h b/tests/t00065/module2/concepts/concepts.h
@@ -5,9 +5,9 @@ namespace t00065 {
 
 template <typename T>
 concept bconcept = requires(T t) {
-                       T{};
-                       t.b();
-                   };
+    T{};
+    t.b();
+};
 
 }
 }
diff --git a/tests/t00074/t00074.cc b/tests/t00074/t00074.cc
@@ -2,9 +2,9 @@ namespace clanguml {
 namespace t00074 {
 template <typename T>
 concept fruit_c = requires(T t) {
-                      T{};
-                      t.get_name();
-                  };
+    T{};
+    t.get_name();
+};
 
 template <typename T>
 concept apple_c = fruit_c<T> && requires(T t) { t.get_sweetness(); };
diff --git a/tests/t00075/t00075.cc b/tests/t00075/t00075.cc
@@ -5,9 +5,9 @@ namespace ns2 {
 
 template <typename T>
 concept C = requires(T t) {
-                T{};
-                t.e();
-            };
+    T{};
+    t.e();
+};
 
 enum class E { k1, k2 };
 
diff --git a/tests/t20034/test_case.h b/tests/t20034/test_case.h
@@ -68,7 +68,7 @@ TEST_CASE("t20034")
                     {"C", "C", "c2()"},          //
                     {"C", "B", "b2()"},          //
                     {"B", "A", "a2()"}           //
-                }                                //
+                } //
             }));
     });
 }
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
@@ -262,8 +262,7 @@ void try_run_test_case(const diagram_source_storage &diagrams, TC &&tc)
                          "--------"
                          "--------------------------\n";
             std::cout << "Test case failed for diagram type "
-                      << T::diagram_type_name << ": "
-                      << "\n\n";
+                      << T::diagram_type_name << ": " << "\n\n";
             std::cout << diagrams.get<T>().to_string() << "\n";
 
             throw e;
diff --git a/util/check_formatting.sh b/util/check_formatting.sh
@@ -49,5 +49,5 @@ if [[ ${#EFFECTIVE_FILE_LIST[@]} -eq 0 ]]; then
     echo ".clang-format-include patterns did not match any files."
     exit 0
 else
-    clang-format-15 --dry-run --Werror ${EFFECTIVE_FILE_LIST}
+    clang-format-18 --dry-run --Werror ${EFFECTIVE_FILE_LIST}
 fi

Original file line number	Diff line number	Diff line change
`@@ -308,8 +308,7 @@ void generator::generate_member(`
`308`	`308`
`309`	`309`	`void generator::generate(const concept_ &c, std::ostream &ostr) const`
`310`	`310`	`{`
`311`		`- ostr << indent(1) << "class"`
`312`		`- << " " << c.alias();`
	`311`	`+ ostr << indent(1) << "class" << " " << c.alias();`
`313`	`312`
`314`	`313`	`ostr << " {" << '\n';`
`315`	`314`	`ostr << indent(2) << "<<concept>>\n";`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ namespace t00065 {`
`5`	`5`
`6`	`6`	`template <typename T>`
`7`	`7`	`concept bconcept = requires(T t) {`
`8`		`- T{};`
`9`		`- t.b();`
`10`		`- };`
	`8`	`+ T{};`
	`9`	`+ t.b();`
	`10`	`+};`
`11`	`11`
`12`	`12`	`}`
`13`	`13`	`}`