From a745b47cf1e2d97e8bbef5eefc181049494ac699 Mon Sep 17 00:00:00 2001 From: Bart Beumer Date: Sun, 27 Jul 2025 10:16:59 +0000 Subject: [PATCH] WIP --- .clang-format | 37 +++++++++++++++++++ .../include/awesome_log/console_writer.hpp | 14 +++---- src/awesome_log/include/awesome_log/log.hpp | 8 ++-- .../include/awesome_log/null_writer.hpp | 14 +++---- .../include/awesome_log/scoped_log.hpp | 32 ++++++++-------- .../include/awesome_log/writer_interface.hpp | 14 +++---- src/awesome_log/src/log.cpp | 4 +- src/awesome_log/src/scoped_log.cpp | 6 +-- src/awesome_log/test/mock_writer.hpp | 2 +- src/awesome_log/test/test_scoped_log.cpp | 17 +++------ src/example_boost/src/main.cpp | 17 +++------ src/hello_world_awesome/src/main.cpp | 5 +-- 12 files changed, 98 insertions(+), 72 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..9fc6dd5 --- /dev/null +++ b/.clang-format @@ -0,0 +1,37 @@ +--- +AlignAfterOpenBracket: Align +AllowAllArgumentsOnNextLine: 'false' +AllowAllConstructorInitializersOnNextLine: 'false' +AllowAllParametersOfDeclarationOnNextLine: 'false' +AllowShortBlocksOnASingleLine: 'false' +AllowShortCaseLabelsOnASingleLine: 'false' +AllowShortFunctionsOnASingleLine: InlineOnly +AllowShortIfStatementsOnASingleLine: Never +AllowShortLambdasOnASingleLine: None +AllowShortLoopsOnASingleLine: 'false' +AlwaysBreakTemplateDeclarations: 'Yes' +BinPackArguments: 'false' +BinPackParameters: 'false' +BreakBeforeBraces: Allman +BreakConstructorInitializers: BeforeComma +ColumnLimit: '120' +Cpp11BracedListStyle: 'true' +FixNamespaceComments: 'true' +IncludeBlocks: Merge +IndentCaseLabels: 'true' +IndentWidth: '4' +Language: Cpp +MaxEmptyLinesToKeep: '2' +NamespaceIndentation: Inner +PointerAlignment: Left +SortUsingDeclarations: 'true' +SpaceAfterTemplateKeyword: 'false' +SpacesInAngles: 'false' +SpacesInCStyleCastParentheses: 'false' +SpacesInContainerLiterals: 'false' +SpacesInSquareBrackets: 'false' +Standard: Cpp11 +TabWidth: '4' +UseTab: Never + +... diff --git a/src/awesome_log/include/awesome_log/console_writer.hpp b/src/awesome_log/include/awesome_log/console_writer.hpp index 5fe4e38..4470678 100644 --- a/src/awesome_log/include/awesome_log/console_writer.hpp +++ b/src/awesome_log/include/awesome_log/console_writer.hpp @@ -5,10 +5,10 @@ namespace awesome_log { - class console_writer : public writer_interface - { - public: - ~console_writer() override; - void log(std::string_view msg) override; - }; -} +class console_writer : public writer_interface +{ + public: + ~console_writer() override; + void log(std::string_view msg) override; +}; +} // namespace awesome_log diff --git a/src/awesome_log/include/awesome_log/log.hpp b/src/awesome_log/include/awesome_log/log.hpp index 749ed61..d43d4b3 100644 --- a/src/awesome_log/include/awesome_log/log.hpp +++ b/src/awesome_log/include/awesome_log/log.hpp @@ -5,8 +5,8 @@ namespace awesome_log { - class writer_interface; +class writer_interface; - writer_interface& get_writer(); - void set_writer(const std::shared_ptr& writer); -} \ No newline at end of file +writer_interface& get_writer(); +void set_writer(const std::shared_ptr& writer); +} // namespace awesome_log \ No newline at end of file diff --git a/src/awesome_log/include/awesome_log/null_writer.hpp b/src/awesome_log/include/awesome_log/null_writer.hpp index fbd2334..88c033a 100644 --- a/src/awesome_log/include/awesome_log/null_writer.hpp +++ b/src/awesome_log/include/awesome_log/null_writer.hpp @@ -5,10 +5,10 @@ namespace awesome_log { - class null_writer : public writer_interface - { - public: - ~null_writer() override; - void log(std::string_view msg) override; - }; -} +class null_writer : public writer_interface +{ + public: + ~null_writer() override; + void log(std::string_view msg) override; +}; +} // namespace awesome_log diff --git a/src/awesome_log/include/awesome_log/scoped_log.hpp b/src/awesome_log/include/awesome_log/scoped_log.hpp index ac4e175..445e959 100644 --- a/src/awesome_log/include/awesome_log/scoped_log.hpp +++ b/src/awesome_log/include/awesome_log/scoped_log.hpp @@ -6,22 +6,22 @@ namespace awesome_log { - class scoped_log - { - public: - scoped_log(std::string_view msg); - ~scoped_log(); +class scoped_log +{ + public: + scoped_log(std::string_view msg); + ~scoped_log(); - scoped_log() = delete; + scoped_log() = delete; - // No copying or moving allowed. - scoped_log(const scoped_log&) = delete; - scoped_log(scoped_log&&) = delete; - scoped_log& operator=(const scoped_log&) = delete; - scoped_log& operator=(scoped_log&&) = delete; + // No copying or moving allowed. + scoped_log(const scoped_log&) = delete; + scoped_log(scoped_log&&) = delete; + scoped_log& operator=(const scoped_log&) = delete; + scoped_log& operator=(scoped_log&&) = delete; - private: - std::string m_msg; - int m_uncaught_exceptions; - }; -} \ No newline at end of file + private: + std::string m_msg; + int m_uncaught_exceptions; +}; +} // namespace awesome_log \ No newline at end of file diff --git a/src/awesome_log/include/awesome_log/writer_interface.hpp b/src/awesome_log/include/awesome_log/writer_interface.hpp index b5f0e48..667229f 100644 --- a/src/awesome_log/include/awesome_log/writer_interface.hpp +++ b/src/awesome_log/include/awesome_log/writer_interface.hpp @@ -5,11 +5,11 @@ namespace awesome_log { - class writer_interface - { - public: - virtual ~writer_interface() = default; +class writer_interface +{ + public: + virtual ~writer_interface() = default; - virtual void log(std::string_view msg) = 0; - }; -} + virtual void log(std::string_view msg) = 0; +}; +} // namespace awesome_log diff --git a/src/awesome_log/src/log.cpp b/src/awesome_log/src/log.cpp index dc4be2b..370e515 100644 --- a/src/awesome_log/src/log.cpp +++ b/src/awesome_log/src/log.cpp @@ -5,12 +5,12 @@ using awesome_log::writer_interface; namespace { - std::shared_ptr g_instance; +std::shared_ptr g_instance; } writer_interface& awesome_log::get_writer() { - if(!g_instance) + if (!g_instance) { g_instance = std::make_shared(); } diff --git a/src/awesome_log/src/scoped_log.cpp b/src/awesome_log/src/scoped_log.cpp index 271ecbb..ac40eb4 100644 --- a/src/awesome_log/src/scoped_log.cpp +++ b/src/awesome_log/src/scoped_log.cpp @@ -1,8 +1,8 @@ -#include #include +#include #include -#include #include +#include using namespace awesome_log; @@ -22,7 +22,7 @@ scoped_log::~scoped_log() std::stringstream ss; ss << "< " << m_msg; - + if (is_stack_unwinding) { ss << " (stack unwinding)"; diff --git a/src/awesome_log/test/mock_writer.hpp b/src/awesome_log/test/mock_writer.hpp index 1465628..aceeef4 100644 --- a/src/awesome_log/test/mock_writer.hpp +++ b/src/awesome_log/test/mock_writer.hpp @@ -6,7 +6,7 @@ class mock_writer : public awesome_log::writer_interface { -public: + public: ~mock_writer() override = default; MOCK_METHOD(void, log, (std::string_view), (override)); diff --git a/src/awesome_log/test/test_scoped_log.cpp b/src/awesome_log/test/test_scoped_log.cpp index 8835b78..806198a 100644 --- a/src/awesome_log/test/test_scoped_log.cpp +++ b/src/awesome_log/test/test_scoped_log.cpp @@ -1,27 +1,22 @@ -#include -#include - #include "mock_writer.hpp" #include #include - +#include +#include #include class test_scoped_log : public ::testing::Test { -public: + public: void SetUp() override { m_writer = std::make_shared(); awesome_log::set_writer(m_writer); } - void TearDown() override - { - awesome_log::set_writer(std::shared_ptr()); - } + void TearDown() override { awesome_log::set_writer(std::shared_ptr()); } -protected: + protected: std::shared_ptr m_writer; }; @@ -45,7 +40,7 @@ TEST_F(test_scoped_log, log_stack_unwind) awesome_log::scoped_log a("log"); throw std::runtime_error(""); } - catch(const std::exception& e) + catch (const std::exception& e) { // Not doing anything } diff --git a/src/example_boost/src/main.cpp b/src/example_boost/src/main.cpp index 23b2371..5cf33dc 100644 --- a/src/example_boost/src/main.cpp +++ b/src/example_boost/src/main.cpp @@ -1,7 +1,7 @@ -#include -#include -#include #include +#include +#include +#include struct position { @@ -9,23 +9,19 @@ struct position int y; template - void serialize(Archive & ar, const unsigned int /*version*/) + void serialize(Archive& ar, const unsigned int /*version*/) { ar & x; ar & y; } - bool operator==(const position& rhs) const - { - return x == rhs.x - && y == rhs.y; - } + bool operator==(const position& rhs) const { return x == rhs.x && y == rhs.y; } }; int main(int argc, char* argv[]) { - position myposition{.x=123, .y=456}; + position myposition{.x = 123, .y = 456}; std::stringstream ss; { @@ -44,5 +40,4 @@ int main(int argc, char* argv[]) { std::cout << "positions are the same" << std::endl; } - } \ No newline at end of file diff --git a/src/hello_world_awesome/src/main.cpp b/src/hello_world_awesome/src/main.cpp index 8d27071..4470aa0 100644 --- a/src/hello_world_awesome/src/main.cpp +++ b/src/hello_world_awesome/src/main.cpp @@ -1,7 +1,6 @@ +#include #include #include -#include - #include #include @@ -22,7 +21,7 @@ int main(int argc, char* argv[]) throw std::runtime_error("Let's play!"); // ... unreachable code goes here. } - catch(const std::exception& e) + catch (const std::exception& e) { std::cout << "Caught an exception, as expected in this example" << std::endl; }