Make code build with gcc 9

Author: Argmaster

.github/workflows/multiplatform_build.yaml

@@ -33,7 +33,8 @@ jobs:
       - name: Checkout code
         uses: actions/[email protected]
 
-      - name: Install LLVM and Clang
+      - if: startsWith(matrix.os, 'windows')
+        name: Install LLVM and Clang
         uses: KyleMayes/[email protected]
         with:
           version: "18"
@@ -52,24 +53,6 @@ jobs:
                         libncurses5-dev libncursesw5-dev xz-utils tk-dev \
                         libffi-dev liblzma-dev python3-openssl git
 
-      - if: endsWith(matrix.os, '20.04')
-        name: Install ubuntu-20.04 specific dependencies
-        run: |
-          sudo apt-get install -y software-properties-common
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-          sudo apt-get update
-          sudo apt-get install -y libtinfo5
-          sudo apt install gcc-13 g++-13
-
-      - if: endsWith(matrix.os, '22.04')
-        name: Install ubuntu-22.04 specific dependencies
-        run: |
-          sudo apt-get install -y software-properties-common
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-          sudo apt-get update
-          sudo apt-get install -y libtinfo5
-          sudo apt install gcc-13 g++-13
-
       - if: endsWith(matrix.os, '24.04')
         name: Install ubuntu-24.04 specific dependencies
         run: |

.prettierignore

@@ -0,0 +1,10 @@
+**/*.min.js
+**/*min.css
+/.tox
+/.git
+/.env
+/.venv
+/coverage
+/dist
+/.venv
+**/data/*

.prettierrc

@@ -0,0 +1,26 @@
+{
+    "semi": true,
+    "useTabs": false,
+    "endOfLine": "lf",
+    "printWidth": 88,
+    "overrides": [
+        {
+            "files": ["*.html", "*.js", "*.json", "*.prettierrc", "*.overrides"],
+            "options": {
+                "tabWidth": 4
+            }
+        },
+        {
+            "files": ["*.md"],
+            "options": {
+                "proseWrap": "always"
+            }
+        },
+        {
+            "files": ["*.css"],
+            "options": {
+                "tabWidth": 4
+            }
+        }
+    ]
+}

CMakeLists.txt

@@ -5,16 +5,27 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+include(cmake/CPM.cmake)
+
+CPMAddPackage(
+    NAME fmt
+    VERSION 8.0.1
+    URL https://github.com/fmtlib/fmt/archive/refs/tags/11.0.2.zip
+)
+
+
 add_library(GerberParserCppModule STATIC)
 target_sources(
     GerberParserCppModule PUBLIC
     FILE_SET cxx_modules TYPE CXX_MODULES FILES
     cpp/src/GerberParserCppModule.cxx
 )
+target_link_libraries(
+    GerberParserCppModule
+    PRIVATE fmt::fmt
+)
 target_compile_features(GerberParserCppModule PUBLIC cxx_std_20)
 
-include(cmake/CPM.cmake)
-
 # Download and load pybind11 with CMake Package Manager
 # See https://github.com/cpm-cmake/CPM.cmake/blob/master/README.md
 CPMAddPackage(
@@ -24,7 +35,11 @@ CPMAddPackage(
 )
 
 pybind11_add_module(PyGerberGerberParserCpp cpp/src/PythonModule.cpp)
-target_link_libraries(PyGerberGerberParserCpp PRIVATE GerberParserCppModule)
+target_link_libraries(
+    PyGerberGerberParserCpp
+    PRIVATE fmt::fmt
+    PRIVATE GerberParserCppModule
+)
 target_compile_features(PyGerberGerberParserCpp PRIVATE cxx_std_20)
 
 add_custom_command(
@@ -46,5 +61,10 @@ file(GLOB_RECURSE test_source_files ${PROJECT_SOURCE_DIR}/cpp/test/ *.test.cpp)
 add_executable(tests)
 target_sources(tests PUBLIC ${test_source_files})
 
-target_link_libraries(tests PRIVATE Catch2::Catch2WithMain GerberParserCppModule)
+target_link_libraries(
+    tests
+    PRIVATE fmt::fmt
+    PRIVATE Catch2::Catch2WithMain
+    PRIVATE GerberParserCppModule
+)
 target_compile_features(tests PRIVATE cxx_std_20)

cpp/src/GerberParserCppModule.cxx

@@ -1,8 +1,8 @@
 module;
 
+#include "fmt/format.h"
 #include <algorithm>
 #include <cstdint>
-#include <format>
 #include <memory>
 #include <regex>
 #include <stdexcept>
@@ -11,6 +11,7 @@ module;
 #include <tuple>
 #include <vector>
 
+
 export module GerberParserCppModule;
 
 export namespace gerber {
@@ -403,7 +404,7 @@ export namespace gerber {
                 (next_endl_or_end_index - global_index) > 20 ? global_index + 20 : next_endl_index;
             const auto source_view = full_source.substr(global_index, end_index);
 
-            auto message = std::format(
+            auto message = fmt::format(
                 "Syntax error at index {} (line: {} column: {}): '{}'",
                 global_index,
                 line,

cpp/test/main.test.cpp

@@ -1,5 +1,6 @@
 import GerberParserCppModule;
 
+#include "fmt/format.h"
 #include <catch2/catch_template_test_macros.hpp>
 #include <catch2/catch_test_macros.hpp>
 
@@ -42,14 +43,14 @@ TEMPLATE_TEST_CASE_SIG(
     (gerber::G91, 91)
 ) {
     gerber::Parser parser;
-    auto           gerber_source = std::format("G{}*G0{}*G00{}*G000{}*", code, code, code, code);
+    auto           gerber_source = fmt::format("G{}*G0{}*G00{}*G000{}*", code, code, code, code);
     auto           result        = parser.parse(gerber_source);
     const auto&    nodes         = result.getNodes();
 
     REQUIRE(nodes.size() == 4);
 
     for (const auto& node : nodes) {
-        REQUIRE(node->getNodeName() == std::format("G{:0>2}", code));
+        REQUIRE(node->getNodeName() == fmt::format("G{:0>2}", code));
     }
 }
 
@@ -93,7 +94,7 @@ TEMPLATE_TEST_CASE_SIG(
 ) {
     std::string    unitModeString = gerber::UnitMode(enumValue).toString();
     gerber::Parser parser;
-    auto           gerber_source = std::format("%MO{}*%", unitModeString);
+    auto           gerber_source = fmt::format("%MO{}*%", unitModeString);
     auto           result        = parser.parse(gerber_source);
     const auto&    nodes         = result.getNodes();