Major refactoring (breaking changes!)

.clang-format

@@ -1,111 +1,125 @@
+# Supports clang-format 10
 ---
 Language:        Cpp
-# BasedOnStyle:  LLVM
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
+AlignConsecutiveAssignments: None
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros: None
 AlignEscapedNewlines: Right
-AlignOperands:   true
+#CF12# AlignOperands:   Align
 AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true # depr. after CF14, see PackConstructorInitializers
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
+#CF12# AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:   
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
+AlwaysBreakTemplateDeclarations: Yes
+#CF12# AttributeMacros: []
+BinPackArguments: false
+BinPackParameters: false
+#CF12# BitFieldColonSpacing:
 BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
+BreakBeforeBraces: Stroustrup
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: AfterComma
 BreakStringLiterals: true
 ColumnLimit:     100
-CommentPragmas:  '^ IWYU pragma:'
+CommentPragmas:  ''
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
+#CF11# DeriveLindEnding: false
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-ForEachMacros:   
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
+ForEachMacros:  []
 IncludeBlocks:   Preserve
-IncludeCategories: 
+IncludeCategories:
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
     Priority:        2
   - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
     Priority:        3
   - Regex:           '.*'
     Priority:        1
-IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainRegex: '(test)?$'
+IncludeIsMainSourceRegex: ''
+#CF13# IndentAccessModifiers:
+#CF11# IndentCaseBlocks:
 IndentCaseLabels: false
+#CF12# IndentExternBlock
+IndentGotoLabels: false
 IndentPPDirectives: None
-IndentWidth:     2
+IndentWidth:     4
 IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
+#CF12# InsertTrailingCommas:
 KeepEmptyLinesAtTheStartOfBlocks: true
+#CF13# LambdaBodyIndentation: Signature
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
+NamespaceMacros: []
+#CF14# PPIndentWidth:
+#CF14# PackConstructorInitializers: Never
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
+#CF12# PenaltyIndentedWhitespace:
 PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
+PointerAlignment: Left
+#CF14# QualifierAlignment
+#CF14# QualifierOrder
+RawStringFormats: []
+#CF14# ReferenceAlignment: Right
 ReflowComments:  true
-SortIncludes:    true
+#CF14# ShortNamespaceLines:
+SortIncludes:    Never
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
+#CF12# SpaceAroundPointerQualifiers: Default
 SpaceBeforeAssignmentOperators: true
-#SpaceBeforeCtorInitializerColon: true
-#SpaceBeforeInheritanceColon: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
-#SpaceBeforeRangeBasedForLoopColon: true
+#CF14# SpaceBeforeParensOptions:
+# AfterControlStatements: true
+# AfterFunctionDefinitionName: true
+SpaceBeforeRangeBasedForLoopColon: true
+#CF11# SpaceBeforeSquareBrackets: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
+#CF14# SpacesInAngles:  false
 SpacesInCStyleCastParentheses: false
+#CF11# SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+#CF14# SpacesInLineCommentPrefix:
+# Minimum: 0
+# Maximum: 1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard:        Cpp11
-TabWidth:        8
+#CF12# StatementAttributeLikeMacros:
+StatementMacros: []
+TabWidth:        4
+#CF11# UseCRLF: Never
 UseTab:          Never
-...
-
+#CF12# WhitespaceSensitiveMacros []

.github/workflows/build-and-test.yml

@@ -4,52 +4,88 @@ on: push
 
 jobs:
   build-and-test:
-    name: Build
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+          - os: ubuntu
+            os_ver: "22.04"
             config: Release
-            static_lib: ON
-            coverage: OFF
-          - os: windows-latest
+            coverage: false
+            cc: gcc-11
+            cxx: g++-11
+          - os: ubuntu
+            os_ver: "20.04"
             config: Release
-            static_lib: ON
-            coverage: OFF
-          - os: macos-latest
+            coverage: false
+            cc: gcc-10
+            cxx: g++-10
+          - os: windows
+            os_ver: "2022"
             config: Release
-            static_lib: ON
-            coverage: OFF
-          - os: ubuntu-latest
-            config: Debug
-            static_lib: OFF
-            coverage: ON
-          - os: ubuntu-18.04
+            coverage: false
+            cc: cl
+            cxx: cl
+          - os: macos
+            os_ver: "12"
+            config: Release
+            coverage: false
+            cc: clang
+            cxx: clang++
+          - os: macos
+            os_ver: "11"
             config: Release
-            static_lib: ON
-            coverage: OFF
+            coverage: false
+            cc: clang
+            cxx: clang++
+          - os: ubuntu
+            os_ver: "20.04"
+            config: Debug
+            coverage: true
+            cc: gcc-10
+            cxx: g++-10
     defaults:
       run:
         shell: bash
-    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }}-${{ matrix.os_ver }} ${{ matrix.cxx }} ${{ matrix.config }} coverage=${{ matrix.coverage }}
+    env:
+      CC: ${{ matrix.cc }}
+      CXX: ${{ matrix.cxx }}
+    runs-on: ${{ matrix.os }}-${{ matrix.os_ver }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Set Project Name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
       - name: Create Build Directory
         run: cmake -E make_directory ${{github.workspace}}/build
+      - name: Set coverage variables
+        id: cov
+        run: |
+          if ${{matrix.coverage}}; then
+          echo "COVERAGE=ON" >> $GITHUB_OUTPUT
+          echo "STATIC_LIB=OFF" >> $GITHUB_OUTPUT
+          else
+          echo "COVERAGE=OFF" >> $GITHUB_OUTPUT
+          echo "STATIC_LIB=ON" >> $GITHUB_OUTPUT
+          fi
       - name: Configure CMake
-        run: cmake -S . -B build -DCMAKE_BUILD_TYPE="${{ matrix.config }}" -D${{ env.REPOSITORY_NAME }}_BUILD_TESTING="ON" -D${{ env.REPOSITORY_NAME }}_STATIC_LIB="${{ matrix.static_lib }}" -D${{ env.REPOSITORY_NAME }}_COVERAGE="${{ matrix.coverage }}"
+        run: cmake -S . -B build -DCMAKE_BUILD_TYPE="${{ matrix.config }}" -D${{ env.REPOSITORY_NAME }}_BUILD_TESTING="ON" -D${{ env.REPOSITORY_NAME }}_STATIC_LIB="${{ steps.cov.outputs.STATIC_LIB }}" -D${{ env.REPOSITORY_NAME }}_COVERAGE="${{ steps.cov.outputs.COVERAGE }}"
       - name: Build
         run: cmake --build build --config ${{ matrix.config }}
       - name: Test
         run: ctest -C ${{ matrix.config }} --output-on-failure
         working-directory: build
       - name: Code Coverage Analysis
-        if: matrix.coverage == 'ON'
+        if: "matrix.coverage"
         run: make gcov
         working-directory: build
       - name: Upload Code Coverage Report
-        if: matrix.coverage == 'ON'
-        uses: codecov/codecov-action@v2
+        if: "matrix.coverage"
+        uses: codecov/codecov-action@v3
+        with:
+          flags: integration
+          functionalities: "gcov"
+          move_coverage_to_trash: true

.gitignore

@@ -1,5 +1,5 @@
-# Ignore the build directory
-builds
-build
-.idea
-.vs/
+builds/
+build/
+.idea/
+.vs/
+.vscode/

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "vendor/googletest"]
 	path = vendor/googletest
 	url = https://github.com/google/googletest.git
+[submodule "vendor/courierr"]
+	path = vendor/courierr
+	url = https://github.com/bigladder/courierr.git
+[submodule "vendor/fmt"]
+	path = vendor/fmt
+	url = https://github.com/fmtlib/fmt.git

CMakeLists.txt

@@ -3,39 +3,39 @@ cmake_minimum_required(VERSION 3.10)
 project(btwxt)
 
 # Set a default build type if none was specified
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "Setting build type to 'Release' as none was specified.")
-  set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
-  # Set the possible values of build type for cmake-gui
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
-    "MinSizeRel" "RelWithDebInfo")
-endif()
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    message(STATUS "Setting build type to 'Release' as none was specified.")
+    set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+    # Set the possible values of build type for cmake-gui
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
+            "MinSizeRel" "RelWithDebInfo")
+endif ()
 
 find_package(Git QUIET)
 
-set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 include(compiler-flags)
 
-option( ${PROJECT_NAME}_BUILD_TESTING "Build ${PROJECT_NAME} testing targets" OFF )
-option( ${PROJECT_NAME}_COVERAGE "Add ${PROJECT_NAME} coverage reports" OFF)
+option(${PROJECT_NAME}_BUILD_TESTING "Build ${PROJECT_NAME} testing targets" OFF)
+option(${PROJECT_NAME}_COVERAGE "Add ${PROJECT_NAME} coverage reports" OFF)
 
 # Set up testing/coverage
 if (${PROJECT_NAME}_BUILD_TESTING)
-  enable_testing()
-  if (${PROJECT_NAME}_COVERAGE)
-    set(ENABLE_COVERAGE ON CACHE BOOL "" FORCE)
-    find_package(codecov)
-  endif()
-endif()
-
-
+    enable_testing()
+    if (${PROJECT_NAME}_COVERAGE)
+        set(ENABLE_COVERAGE ON CACHE BOOL "" FORCE)
+        find_package(codecov)
+    endif ()
+endif ()
+
+add_subdirectory("include/${PROJECT_NAME}")
 add_subdirectory(src)
 add_subdirectory(vendor)
 
 if (${PROJECT_NAME}_BUILD_TESTING)
-  add_subdirectory(test)
-  if (${PROJECT_NAME}_COVERAGE)
-    coverage_evaluate()
-  endif()
-endif()
+    add_subdirectory(test)
+    if (${PROJECT_NAME}_COVERAGE)
+        coverage_evaluate()
+    endif ()
+endif ()