Update clang-format config

Author: chfast

.clang-format

@@ -5,17 +5,22 @@ AccessModifierOffset: -4
 AlignAfterOpenBracket: DontAlign
 BinPackParameters: true
 BraceWrapping:
-  AfterClass:      true
+  AfterCaseLabel:        true
+  AfterClass:            true
   AfterControlStatement: true
-  AfterEnum:       true
-  AfterFunction:   true
-  AfterNamespace:  true
-  AfterObjCDeclaration: true
-  AfterStruct:     true
-  AfterUnion:      true
-  BeforeCatch:     true
-  BeforeElse:      true
-  SplitEmptyFunction: false
+  AfterEnum:             true
+  AfterFunction:         true
+  AfterNamespace:        true
+  AfterStruct:           true
+  AfterUnion:            true
+  # AfterExternBlock:      true
+  BeforeCatch:           true
+  BeforeElse:            true
+  # BeforeLambdaBody:      true
+  # BeforeWhile:           true
+  SplitEmptyFunction:    false
+  SplitEmptyRecord:      false
+  SplitEmptyNamespace:   false
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: false
 ColumnLimit:     100
@@ -34,6 +39,7 @@ IncludeCategories:
     Priority:        4
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
+# IndentExternBlock: NoIndent
 IndentWidth:     4
 MaxEmptyLinesToKeep: 2
 PenaltyBreakAssignment: 1

lib/evmone/evmone.cpp

@@ -13,8 +13,7 @@ extern "C" {
 EVMC_EXPORT evmc_vm* evmc_create_evmone() noexcept
 {
     static constexpr auto destroy = [](evmc_vm*) noexcept {};
-    static constexpr auto get_capabilities = [](evmc_vm*) noexcept
-    {
+    static constexpr auto get_capabilities = [](evmc_vm*) noexcept {
         return evmc_capabilities_flagset{EVMC_CAPABILITY_EVM1};
     };
 

test/internal_benchmarks/find_jumpdest_bench.cpp

@@ -85,14 +85,12 @@ struct map_builder
 };
 
 template <typename T>
-const std::array<std::pair<T, T>, jumpdest_map_size> map_builder<T>::map = []() noexcept
-{
+const std::array<std::pair<T, T>, jumpdest_map_size> map_builder<T>::map = []() noexcept {
     auto m = std::array<std::pair<T, T>, jumpdest_map_size>{};
     for (size_t i = 0; i < m.size(); ++i)
         m[i] = {static_cast<T>(2 * i + 1), static_cast<T>(2 * i + 2)};
     return m;
-}
-();
+}();
 
 template <typename T, T (*F)(const std::pair<T, T>*, size_t, T) noexcept>
 void find_jumpdest(benchmark::State& state)
@@ -195,17 +193,15 @@ struct split_map_builder
 };
 
 template <typename T>
-const split_map<T> split_map_builder<T>::map = []() noexcept
-{
+const split_map<T> split_map_builder<T>::map = []() noexcept {
     auto m = split_map<T>{};
     for (size_t i = 0; i < m.key.size(); ++i)
     {
         m.key[i] = static_cast<T>(2 * i + 1);
         m.value[i] = static_cast<T>(2 * i + 2);
     }
     return m;
-}
-();
+}();
 
 template <typename T>
 inline T lower_bound(const T* begin, const T* values, size_t size, T offset) noexcept

test/utils/dump.cpp

@@ -30,8 +30,7 @@ void dump(const evmone::code_analysis& analysis)
         {
             block = &instr.arg.block;
 
-            const auto get_jumpdest_offset = [&analysis](size_t index) noexcept
-            {
+            const auto get_jumpdest_offset = [&analysis](size_t index) noexcept {
                 for (size_t t = 0; t < analysis.jumpdest_targets.size(); ++t)
                 {
                     if (static_cast<size_t>(analysis.jumpdest_targets[t]) == index)