-updated seal_lake to v0.2.0

kamchatka-volcano · kamchatka-volcano · commit 16677cc110c0 · 2024-06-12T00:06:40.000+05:00
-updated figcone_tree to v2.1.0
-added CMakePresets.json
-set version to v1.1.0
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -1,6 +1,7 @@
 name: build & test (clang, gcc, MSVC)
 
 on:
+  workflow_dispatch:
   push:
     branches: [ "master", "dev" ]
     paths-ignore:
@@ -25,30 +26,34 @@ jobs:
           - {
             name: "Ubuntu Latest gcc",
             os: ubuntu-latest,
-            cc: "gcc",
-            cxx: "g++",
-            flags: "-Wall -Werror -Wextra -Wpedantic -Wcast-align -Wnon-virtual-dtor -Woverloaded-virtual -Wunused"
+            cmake-preset: "gcc-release"
           }
           - {
             name: "Ubuntu Latest clang",
             os: ubuntu-latest,
-            cc: "clang",
-            cxx: "clang++",
-            flags: "-Wall -Werror -Wextra -Wpedantic -Wcast-align -Wnon-virtual-dtor -Woverloaded-virtual -Wunused"
+            cmake-preset: "clang-release"
           }
           - {
             name: "Windows Latest MSVC",
             os: windows-latest,
-            cc: "cl",
-            cxx: "cl",
-            flags: "/EHsc /W4 /WX"
+            cmake-preset: "msvc-release"
           }
 
     steps:
-    - uses: actions/checkout@v3
+    - name: Install ninja (Windows)
+      if: matrix.config.os == 'windows-latest'
+      run: choco install ninja
+    - name: Install ninja (Linux)
+      if: matrix.config.os == 'ubuntu-latest'
+      run: sudo apt install ninja-build
+    - uses: actions/checkout@v4
+
+    - uses: rui314/setup-mold@v1
+    - uses: hendrikmuhs/ccache-action@v1.2
+    - uses: ilammy/msvc-dev-cmd@v1
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DENABLE_TESTS=ON -DCMAKE_CXX_FLAGS="${{ matrix.config.flags }}"
+      run: cmake -B ${{github.workspace}}/build -DENABLE_TESTS=ON --preset="${{ matrix.config.cmake-preset }}"
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,13 +1,12 @@
 cmake_minimum_required(VERSION 3.18)
 
-project(figcone_ini VERSION 1.0.0 DESCRIPTION "inifile-cpp parser adapter for figcone library")
-include(GNUInstallDirs)
+project(figcone_ini VERSION 1.1.0 DESCRIPTION "inifile-cpp parser adapter for figcone library")
 include(external/seal_lake)
 
 SealLake_Bundle(
         NAME figcone_inicpp
-        GIT_REPOSITORY https://github.com/Rookfighter/inifile-cpp.git
-        GIT_TAG master
+        GIT_REPOSITORY https://github.com/kamchatka-volcano/inifile-cpp.git
+        GIT_TAG v0.1.0
         SKIP_LOAD
         TEXT_REPLACEMENTS
             "namespace ini" "namespace figcone::ini"
@@ -16,16 +15,16 @@ SealLake_Bundle(
 SealLake_Bundle(
         NAME figcone_ini_sfun
         GIT_REPOSITORY https://github.com/kamchatka-volcano/sfun.git
-        GIT_TAG        v5.0.0
+        GIT_TAG        v5.1.0
         TEXT_REPLACEMENTS
             "namespace sfun" "namespace figcone::ini::sfun"
 )
 
-set(INSTALL_FIGCONE_TREE ON)
+SealLake_IsInstallEnabled(INSTALL_FIGCONE_TREE)
 SealLake_Import(
-        figcone_tree 2.0.0
+        figcone_tree 2.1.0
         GIT_REPOSITORY https://github.com/kamchatka-volcano/figcone_tree.git
-        GIT_TAG      v2.0.0
+        GIT_TAG      v2.1.0
 )
 
 SealLake_ObjectLibrary(
@@ -43,7 +42,7 @@ SealLake_ObjectLibrary(
         LIBRARIES
             figcone_ini_sfun::figcone_ini_sfun
         DEPENDENCIES
-            figcone_tree 2.0.0
+            figcone_tree 2.1.0
 )
 
-SealLake_OptionalBuildSteps(tests)
+SealLake_OptionalSubProjects(tests)
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -0,0 +1,123 @@
+{
+  "version": 6,
+  "configurePresets": [
+    {
+      "name": "base-linux",
+      "hidden": true,
+      "displayName": "linux base preset",
+      "generator": "Ninja",
+      "binaryDir": "build-${presetName}",
+      "cacheVariables": {
+        "CMAKE_EXE_LINKER_FLAGS": "-fuse-ld=mold",
+        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+        "CPM_SOURCE_CACHE": "cpm_cache"
+      }
+    },
+    {
+      "name": "clang-base",
+      "hidden": true,
+      "displayName": "clang base preset",
+      "inherits": "base-linux",
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "clang++",
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Werror -Wcast-align -Wnon-virtual-dtor -Woverloaded-virtual -Wunused"
+      }
+    },
+    {
+      "name": "clang-debug",
+      "displayName": "clang (Debug)",
+      "inherits": "clang-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "clang-release",
+      "displayName": "clang (Release)",
+      "inherits": "clang-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "gcc-base",
+      "hidden": true,
+      "displayName": "gcc base preset",
+      "inherits": "base-linux",
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "g++",
+        "CMAKE_C_COMPILER": "gcc",
+        "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Werror -Wcast-align -Wnon-virtual-dtor -Woverloaded-virtual -Wunused"
+      }
+    },
+    {
+      "name": "gcc-debug",
+      "displayName": "gcc (Debug)",
+      "inherits": "gcc-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "gcc-release",
+      "displayName": "gcc (Release)",
+      "inherits": "gcc-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "base-windows",
+      "displayName": "windows base preset",
+      "hidden": true,
+      "generator": "Ninja",
+      "binaryDir": "build-${presetName}",
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
+      "cacheVariables": {
+        "CPM_SOURCE_CACHE": "cpm_cache",
+        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache"
+      },
+      "vendor": {
+        "microsoft.com/VisualStudioSettings/CMake/1.0": {
+          "hostOS": [
+            "Windows"
+          ]
+        },
+        "jetbrains.com/clion": {
+          "toolchain": "Visual Studio"
+        }
+      }
+    },
+    {
+      "name": "msvc-base",
+      "hidden": true,
+      "displayName": "msvc base preset",
+      "inherits": "base-windows",
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "cl.exe",
+        "CMAKE_C_COMPILER": "cl.exe",
+        "CMAKE_CXX_FLAGS": "/EHsc /W4 /WX"
+      }
+    },
+    {
+      "name": "msvc-debug",
+      "displayName": "msvc (Debug)",
+      "inherits": "msvc-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "msvc-release",
+      "displayName": "msvc (Release)",
+      "inherits": "msvc-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    }
+  ]
+}
diff --git a/external/seal_lake b/external/seal_lake
@@ -1,8 +1,10 @@
 include(FetchContent)
-Set(FETCHCONTENT_QUIET FALSE)
-FetchContent_Declare(seal_lake
+set(SEAL_LAKE_VERSION v0.2.0)
+set(FETCHCONTENT_QUIET FALSE)
+FetchContent_Declare(seal_lake_${SEAL_LAKE_VERSION}
+    SOURCE_DIR seal_lake_${SEAL_LAKE_VERSION}
     GIT_REPOSITORY "https://github.com/kamchatka-volcano/seal_lake.git"
-    GIT_TAG "origin/master"
+    GIT_TAG ${SEAL_LAKE_VERSION}
 )
-FetchContent_MakeAvailable(seal_lake)
-include(${seal_lake_SOURCE_DIR}/seal_lake.cmake)
+FetchContent_MakeAvailable(seal_lake_${SEAL_LAKE_VERSION})
+include(${seal_lake_${SEAL_LAKE_VERSION}_SOURCE_DIR}/seal_lake.cmake)
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -23,7 +23,7 @@ bool isUnsignedInt(const std::string& str)
 
 bool hasRootSection(std::istream& stream)
 {
-    auto pos = stream.tellg();
+    const auto pos = stream.tellg();
     auto firstWord = std::string{};
     stream >> firstWord;
     stream.seekg(pos);
@@ -39,8 +39,7 @@ std::string getStreamContent(std::istream& stream)
 void parseSection(const figcone::ini::IniSection& section, figcone::TreeNode& node)
 {
     for (const auto& [key, value] : section) {
-        auto paramList = detail::readParamList(key, value.as<std::string>());
-        if (paramList)
+        if (const auto paramList = detail::readParamList(key, value.as<std::string>()))
             node.asItem().addParamList(key, *paramList);
         else
             node.asItem().addParam(key, detail::readParam(value.as<std::string>()));
@@ -49,16 +48,16 @@ void parseSection(const figcone::ini::IniSection& section, figcone::TreeNode& no
 
 std::string beforeLast(const std::string& str, const std::string& delim)
 {
-    auto pos = str.rfind(delim);
+    const auto pos = str.rfind(delim);
     if (pos == std::string::npos)
         return str;
     return str.substr(0, pos);
 }
 
 figcone::ConfigError makeConfigError(const std::exception& e, bool hasFakeRootSection)
 {
-    auto message = std::string{e.what()};
-    auto regex = std::regex{R"(l\.(\d+): (.*))"};
+    const auto message = std::string{e.what()};
+    static const auto regex = std::regex{R"(l\.(\d+): (.*))"};
     auto match = std::smatch{};
     if (std::regex_search(message, match, regex)) {
         auto line = std::stoi(match[1]);
@@ -106,7 +105,7 @@ Tree Parser::parse(std::istream& stream)
         return *fixedInputStream;
     }();
 
-    auto ini = [&]
+    const auto ini = [&]
     {
         try {
             return IniFile{input};
@@ -116,10 +115,10 @@ Tree Parser::parse(std::istream& stream)
         }
     }();
 
-    auto tree = figcone::makeTreeRoot();
-    impl_->createSectionNodes(ini, *tree);
-    impl_->parseSections(ini, *tree);
-    return tree;
+    auto treeRoot = figcone::makeTreeRoot();
+    impl_->createSectionNodes(ini, *treeRoot);
+    impl_->parseSections(ini, *treeRoot);
+    return Tree{std::move(treeRoot)};
 }
 
 void Parser::Impl::parseSections(const IniFile& ini, figcone::TreeNode& node)
@@ -157,8 +156,8 @@ void Parser::Impl::createSectionNodes(const IniFile& ini, figcone::TreeNode& nod
                         newSectionName,
                         [&](auto& parentNode)
                         {
-                            auto listSectionName = beforeLast(newSectionName, ".");
-                            auto sectionArrayIndex = std::stoi(sectionPart);
+                            const auto listSectionName = beforeLast(newSectionName, ".");
+                            const auto sectionArrayIndex = std::stoi(sectionPart);
                             if (sectionArrayIndex != sectionArrays_[listSectionName]) {
                                 if (sectionArrayIndex != ++sectionArrays_[listSectionName])
                                     throw figcone::ConfigError{"Section array index mismatch"};
