run clang-format

Author: ObiWahn

.clang-format

@@ -1,33 +1,56 @@
 ---
-# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-# We'll use defaults from the LLVM style, but with 4 columns indentation.
-BasedOnStyle: LLVM
-IndentWidth: 4
----
 Language:        Cpp
 AccessModifierOffset: 0
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveMacros:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
 AlignEscapedNewlines: Left
-AlignOperands:   true
+AlignOperands:   Align
 AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortLambdasOnASingleLine: false 
 AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: false
+AllowShortLambdasOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
+  AfterCaseLabel:  false
   AfterClass:      false
-  AfterControlStatement: false
+  AfterControlStatement: Never
   AfterEnum:       false
   AfterFunction:   false
   AfterNamespace:  false
@@ -37,11 +60,14 @@ BraceWrapping:
   AfterExternBlock: false
   BeforeCatch:     false
   BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
   IndentBraces:    false
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
 BreakBeforeBraces: Attach
 BreakBeforeInheritanceComma: false
 BreakInheritanceList: BeforeComma
@@ -52,76 +78,139 @@ BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit:     120
 CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
 CompactNamespaces: true
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
+DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: NextLine
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+AllowAllConstructorInitializersOnNextLine: true
 FixNamespaceComments: true
 ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
 IncludeBlocks:   Preserve
 IncludeCategories:
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
     Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
   - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
     Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
   - Regex:           '.*'
     Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
 IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
 IndentCaseLabels: true
+IndentCaseBlocks: false
+IndentGotoLabels: true
 IndentPPDirectives: BeforeHash
+IndentExternBlock: AfterExternBlock
+IndentRequiresClause: true
 IndentWidth:     4
 IndentWrappedFunctionNames: true
+InsertBraces:    false
+InsertTrailingCommas: None
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
 PointerAlignment: Left
+PPIndentWidth:   -1
+ReferenceAlignment: Pointer
 ReflowComments:  true
-SortIncludes:    true
+RemoveBracesLLVM: false
+RequiresClausePosition: OwnLine
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
 SortUsingDeclarations: false
 SpaceAfterCStyleCast: true
-SpaceAfterTemplateKeyword: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   true
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Default
 SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp11
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: Both
+Standard:        Latest
+StatementAttributeLikeMacros:
+  - Q_EMIT
 StatementMacros:
   - Q_UNUSED
+  - Q_DEBUG
   - QT_REQUIRE_VERSION
 TabWidth:        4
+UseCRLF:         false
 UseTab:          Never
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
 ...
 
-

.conan/test_package/test_package.cpp

@@ -3,13 +3,12 @@
 
 #include <cstdlib>
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <ext/util/show.hpp>
 
-int main()
-{
+int main() {
     std::vector<std::string> out{"ext::basics", "successfully", "installs"};
     using ext::util::operator<<;
     std::cout << "\n\n" << out << "\n" << std::endl;

.github/workflows/clang-format.yml

@@ -19,4 +19,4 @@ jobs:
     - uses: DoozyX/[email protected]
       with:
         extensions: 'hpp,cpp'
-        clangFormatVersion: 14
+        clangFormatVersion: 15

examples/show.cpp

@@ -34,7 +34,7 @@ int main(/*int argc, const char *argv[]*/) {
 
     // prefer this!
     std::cout << vec2 << std::endl;
-#endif
+#endif // CLANG_ANALYZE
 
     return 0;
 }

examples/tagged_pointer.cpp

@@ -1,8 +1,8 @@
 // Copyright - 2020 - Jan Christoph Uhde <[email protected]>
 // Please see LICENSE.md for license or visit https://github.com/extcpp/basics
 #include <ext/memory/tagged_pointer.hpp>
-#include <ext/util/bit_tricks.hpp>
 #include <ext/meta/basic.hpp>
+#include <ext/util/bit_tricks.hpp>
 
 #include <atomic>
 #include <iostream>

include/ext/algorithm/basic.hpp

@@ -10,7 +10,7 @@
 #include <vector>
 namespace ext { namespace algorithm {
 
-template<typename T, typename Predicate, bool stable = false>
+template <typename T, typename Predicate, bool stable = false>
 std::vector<T> partition_out(std::vector<T>& vec, Predicate pred) {
     auto end = vec.end();
     decltype(end) split_point;
@@ -30,43 +30,43 @@ std::vector<T> partition_out(std::vector<T>& vec, Predicate pred) {
     return out;
 }
 
-template<typename T, typename Predicate>
+template <typename T, typename Predicate>
 std::vector<T> stable_partition_out(std::vector<T>& vec, Predicate&& pred) {
     return partition_out<T, Predicate, true>(vec, std::forward<Predicate>(pred));
 }
 
-template<typename T, typename Predicate = std::less<>>
+template <typename T, typename Predicate = std::less<>>
 T const& min(T const& a, T const& b, T const& c, Predicate comp = Predicate()) {
     return std::min(a, std::min(b, c, comp), comp);
 }
 
-template<typename T, typename Predicate = std::less<>>
+template <typename T, typename Predicate = std::less<>>
 T const& max(T const& a, T const& b, T const& c, Predicate comp = Predicate()) {
     return std::max(std::max(a, b, comp), c, comp);
 }
 
-template<typename T>
+template <typename T>
 T&& min(T&& x) {
     return std::forward<T>(x);
 }
 
-template<typename T1, typename T2, typename... Ts>
+template <typename T1, typename T2, typename... Ts>
 decltype(auto) min(T1&& x1, T2&& x2, Ts&&... xs) {
     return (x1 < x2) ? min(x1, std::forward<Ts>(xs)...) : min(x2, std::forward<Ts>(xs)...);
 }
 
-template<typename T>
+template <typename T>
 T&& max(T&& x) {
     return std::forward<T>(x);
 }
 
-template<typename T1, typename T2, typename... Ts>
+template <typename T1, typename T2, typename... Ts>
 decltype(auto) max(T1&& x1, T2&& x2, Ts&&... xs) {
     return (x1 > x2) ? max(x1, std::forward<Ts>(xs)...) : max(x2, std::forward<Ts>(xs)...);
 }
 
 // count occurrences in container /////////////////////////////////////////
-template<typename Iterator, typename Int = std::size_t>
+template <typename Iterator, typename Int = std::size_t>
 auto count_occurrences(Iterator begin, Iterator end) {
     using Key = typename std::iterator_traits<Iterator>::value_type;
     std::map<Key, Int> result;
@@ -76,7 +76,7 @@ auto count_occurrences(Iterator begin, Iterator end) {
     return result;
 }
 
-template<typename Container, typename Int = int>
+template <typename Container, typename Int = int>
 auto count_occurrences(const Container& container) {
     using Iterator = decltype(std::begin(container));
     return count_occurrences<Iterator, Int>(std::begin(container), std::end(container));
@@ -85,7 +85,7 @@ auto count_occurrences(const Container& container) {
 // merge maps //////////////////////////////////////////////////////////////
 // Items that are already present in the first map get replaced if
 // the predicate evaluates to true
-template<typename Map, typename Predicate = std::not_equal_to<>>
+template <typename Map, typename Predicate = std::not_equal_to<>>
 auto& merge_maps(Map& modify, const Map& add, Predicate predicate = Predicate()) {
     for (auto it = add.begin(); it != add.end(); it++) {
         auto found = modify.find(it->first);