Merge branch 'v3'

marzer · Jan 11, 2022 · 5c5abfd · 5c5abfd
2 parents 20d3c13 + d33da0c
commit 5c5abfd
Show file tree

Hide file tree

Showing 177 changed files with 32,418 additions and 22,614 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
 
     debug_clang:
         docker:
-            - image: marzer/cpp_dev:0.1.0
+            - image: marzer/cpp_dev:0.2.0
         resource_class: large
         steps:
             - checkout
@@ -23,12 +23,13 @@ jobs:
             - run:
                 name: Building and testing with clang
                 command: |
-                    CXX_LD=lld CXX=clang++ meson build --buildtype=debug -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false
+                    update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-13 130
+                    CXX_LD=lld CXX=clang++ meson build --buildtype=debug -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false -Dasan_examples=true
                     cd build && meson compile -j 4 && meson test --num-processes 1 --verbose
 
     release_clang:
         docker:
-            - image: marzer/cpp_dev:0.1.0
+            - image: marzer/cpp_dev:0.2.0
         resource_class: large
         steps:
             - checkout
@@ -39,12 +40,13 @@ jobs:
             - run:
                 name: Building and testing with clang
                 command: |
-                    CXX_LD=lld CXX=clang++ meson build --buildtype=release -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false
+                    update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-13 130
+                    CXX_LD=lld CXX=clang++ meson build --buildtype=release -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false -Dasan_examples=true
                     cd build && meson compile -j 4 && meson test --num-processes 1 --verbose
 
     debug_gcc:
         docker:
-            - image: marzer/cpp_dev:0.1.0
+            - image: marzer/cpp_dev:0.2.0
         resource_class: large
         steps:
             - checkout
@@ -55,12 +57,13 @@ jobs:
             - run:
                 name: Building and testing with gcc
                 command: |
+                    update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-13 130
                     CXX_LD=lld CXX=g++ meson build --buildtype=debug -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false
                     cd build && meson compile -j 4 && meson test --num-processes 1 --verbose
 
     release_gcc:
         docker:
-            - image: marzer/cpp_dev:0.1.0
+            - image: marzer/cpp_dev:0.2.0
         resource_class: large
         steps:
             - checkout
@@ -71,12 +74,13 @@ jobs:
             - run:
                 name: Building and testing with gcc
                 command: |
+                    update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-13 130
                     CXX_LD=lld CXX=g++ meson build --buildtype=release -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false
                     cd build && meson compile -j 4 && meson test --num-processes 1 --verbose
 
     generate_dox:
         docker:
-            - image: marzer/cpp_dev:0.1.0
+            - image: marzer/cpp_dev:0.2.0
         resource_class: small
         steps:
             - checkout

diff --git a/.clang-format b/.clang-format
@@ -25,8 +25,15 @@ AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: Yes
 AttributeMacros:
   - TOML_ABSTRACT_BASE
+  - TOML_CLOSED_ENUM
+  - TOML_CLOSED_FLAGS_ENUM
   - TOML_EMPTY_BASES
+  - TOML_FLAGS_ENUM
+  - TOML_LIKELY_CASE
+  - TOML_OPEN_ENUM
+  - TOML_OPEN_FLAGS_ENUM
   - TOML_TRIVIAL_ABI
+  - TOML_UNLIKELY_CASE
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
@@ -96,7 +103,7 @@ IncludeIsMainSourceRegex: ''
 IndentCaseLabels: true
 IndentCaseBlocks: false
 IndentGotoLabels: true
-IndentPPDirectives: BeforeHash
+IndentPPDirectives: None
 IndentExternBlock: Indent
 IndentRequires:  false
 IndentWidth:     4
@@ -124,6 +131,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 1000000
 PenaltyIndentedWhitespace: 0
 PointerAlignment: Left
+ReferenceAlignment: Left
 ReflowComments:  true
 SortIncludes:    false
 SortJavaStaticImport: Before
@@ -155,13 +163,17 @@ StatementMacros:
   - TOML_ALWAYS_INLINE
   - TOML_API
   - TOML_ATTR
-  - TOML_CONSTEVAL
+  - TOML_CONST_GETTER
+  - TOML_CONST_INLINE_GETTER
+  - TOML_EXTERN
   - TOML_EXTERNAL_LINKAGE
   - TOML_INTERNAL_LINKAGE
   - TOML_MEMBER_ATTR
   - TOML_NEVER_INLINE
   - TOML_NODISCARD
   - TOML_NODISCARD_CTOR
+  - TOML_PURE_GETTER
+  - TOML_PURE_INLINE_GETTER
   - TOML_RETURNS_BY_THROWING
 TabWidth:        4
 TypenameMacros:

diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
 *                  text=auto                encoding=UTF-8
 
+*.bat              text         eol=lf      encoding=UTF-8
 *.c                text         eol=lf      encoding=UTF-8
 *.cpp              text         eol=lf      encoding=UTF-8
 *.css              text         eol=lf      encoding=UTF-8

diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "external/tloptional"]
 	path = external/tloptional
 	url = https://github.com/TartanLlama/optional.git
+[submodule "external/json"]
+	path = external/json
+	url = https://github.com/nlohmann/json.git