Merge pull request #18 from FreeYourSoul/sat/reimplement

Sat Reimplementation

Author: FreeYourSoul

.clang-format

@@ -1,21 +1,21 @@
 # Generated from CLion C/C++ Code Style settings
 BasedOnStyle: LLVM
 AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
+AlignAfterOpenBracket: DontAlign
 AlignConsecutiveAssignments: true
 AlignOperands: AlignAfterOperator
-AllowAllArgumentsOnNextLine: false
-AllowAllConstructorInitializersOnNextLine: true
+AllowAllArgumentsOnNextLine: true
+BreakFunctionDefinitionParameters: false
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: Always
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: false
 AllowShortEnumsOnASingleLine: false
-AlwaysBreakAfterReturnType: None
-AlwaysBreakTemplateDeclarations: MultiLine
+BreakAfterReturnType: None
+BreakTemplateDeclarations: MultiLine
 BreakBeforeBraces: Custom
 BraceWrapping:
   AfterCaseLabel: false
@@ -30,39 +30,44 @@ BraceWrapping:
   IndentBraces: false
   SplitEmptyFunction: false
   SplitEmptyRecord: true
-BinPackArguments: true
-BinPackParameters: false
+BinPackArguments: false
+BinPackParameters: BinPack
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeTernaryOperators: false
-BreakConstructorInitializers: BeforeColon
-BreakInheritanceList: BeforeColon
-ColumnLimit: 120
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeComma
+ColumnLimit: 180
 CompactNamespaces: false
+AlignConsecutiveDeclarations: false
 ContinuationIndentWidth: 4
-IndentCaseLabels: false
+IndentCaseLabels: true
 IndentPPDirectives: None
 IndentWidth: 4
-KeepEmptyLinesAtTheStartOfBlocks: true
+KeepEmptyLines:
+  AtEndOfFile: false
+  AtStartOfBlock: true
+  AtStartOfFile: true
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PointerAlignment: Left
 AlignArrayOfStructures: Left
-AlignEscapedNewlines: Left
-AlignTrailingComments: true
-ReflowComments: false
-SpaceAfterCStyleCast: false
+AlignEscapedNewlines: LeftWithLastLine
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 2
+SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: false
+SpaceBeforeCpp11BracedList: true
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
 SpaceBeforeSquareBrackets: false
 SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
+SpacesInParens: Custom
 SpacesBeforeTrailingComments: 1
 SpacesInAngles: false
 SpacesInCStyleCastParentheses: false
@@ -72,3 +77,14 @@ SpacesInSquareBrackets: false
 LambdaBodyIndentation: Signature
 TabWidth: 4
 UseTab: Never
+AlignConsecutiveBitFields:
+  Enabled: false
+  AcrossEmptyLines: true
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+IndentRequiresClause: false
+ReferenceAlignment: Pointer
+SortIncludes: CaseInsensitive
+IncludeBlocks: Preserve
+Language: Cpp
+Standard: Latest

.github/workflows/ci-linux.yml

@@ -1,92 +1,23 @@
-# https://github.com/marketplace/actions/run-vcpkg#use-vcpkg-as-a-submodule-of-your-repository
-# https://github.com/lukka/CppCMakeVcpkgTemplate/blob/v11/.github/workflows/hosted-pure-workflow.yml
-name: "Build Linux"
+name: CI Linux Build
+
 on:
-  pull_request:
   push:
+    branches: [ "main", "develop" ]
+  pull_request:
+    branches: [ "main", "develop" ]
+
 jobs:
   build:
-    name: ${{ matrix.os }}-${{ github.workflow }}
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest ]
-        include:
-          - os: ubuntu-latest
-            triplet: x64-linux
-
-    env:
-      VCPKG_ROOT: ${{ github.workspace }}/vcpkg
-      VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg/bincache
-      VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
+    runs-on: ubuntu-latest
 
     steps:
-      # Set env vars needed for vcpkg to leverage the GitHub Action cache as a storage
-      # for Binary Caching.
-      - uses: actions/github-script@v6
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - name: "Create directory '${{ env.VCPKG_DEFAULT_BINARY_CACHE }}'"
-        run: mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
-        shell: bash
-
-      # Unix specifics
-      - name: Set up GCC / Clang tools
-        run: |
-          echo g++ --version && g++ --version
-          sudo apt-get install build-essential clang clang-tools
-          sudo apt -y install g++-12
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 10
-          sudo update-alternatives --config g++
-          echo g++ --version && g++ --version
-
-      - uses: lukka/get-cmake@latest
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      # Restore vcpkg from the GitHub Action cache service. Note that packages are restored by vcpkg binary caching
-      # when it is being run afterward by CMake.
-      - name: Restore vcpkg
-        uses: actions/cache@v3
+      - name: Install Nix
+        uses: cachix/install-nix-action@v31
         with:
-          path: |
-            ${{ env.VCPKG_ROOT }}
-            !${{ env.VCPKG_ROOT }}/buildtrees
-            !${{ env.VCPKG_ROOT }}/packages
-            !${{ env.VCPKG_ROOT }}/downloads
-            !${{ env.VCPKG_ROOT }}/installed
-          # The key is composed in a way that it gets properly invalidated whenever a different version of vcpkg is being used.
-          key: |
-            ${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}
-
-      # Run CMake to generate Ninja project files, using the vcpkg toolchain file to resolve and install
-      # the dependencies as specified in vcpkg.json. Note that the vcpkg toolchain is specified
-      # in the CMakePresets.json file.
-      # This step also runs vcpkg with Binary Caching leveraging GitHub Action cache to
-      # store the built packages artifacts.
-      - name: Restore from cache the dependencies and generate project files
-        run: |
-          cmake --preset x64-Debug-Linux
-
-      - name: Clang-Tidy
-        run: |
-          run-clang-tidy -p ${{ github.workspace }}/build/.cmake/x64-Debug-Linux -checks='-*,modernize-use-override' || echo ignore
-
-      - name: Clang-Format
-        run: |
-          find fabko -regex '.*\.\(cpp\|hpp\|cc\|cxx\)' | xargs clang-format --dry-run -style=file -i          
-
-      - name: Build
-        run: |
-          cmake --build --preset x64-Debug-Linux
+          nix_path: nixpkgs=channel:nixos-25.05
 
-      - name: Test
-        run: |
-          ctest --preset x64-Debug-Linux
+      - name: Build project
+        run: nix-build .nix/default.nix --no-out-link

.github/workflows/ci-macosx.yml

@@ -0,0 +1,10 @@
+{
+pkgs ? import <nixpkgs> {}
+, execute_test  ? false
+, with_coverage ? false
+}:
+
+let
+  fabko = pkgs.callPackage ./fabko.nix { inherit execute_test;  inherit with_coverage;  };
+in
+fabko