diff --git a/.clang-format b/.clang-format index fce23d78..3e6280fa 100644 --- a/.clang-format +++ b/.clang-format @@ -98,5 +98,6 @@ QualifierAlignment: Custom QualifierOrder: ["constexpr", "const", "inline", "static", "type"] SortIncludes: Never SortUsingDeclarations: LexicographicNumeric +IncludeBlocksStyle: Merge -WhitespaceSensitiveMacros: ["PK_PROTECTED"] \ No newline at end of file +WhitespaceSensitiveMacros: ["PK_PROTECTED"] diff --git a/include/pocketpy/interpreter/vm.hpp b/include/pocketpy/interpreter/vm.hpp index 8ddab560..c694313a 100644 --- a/include/pocketpy/interpreter/vm.hpp +++ b/include/pocketpy/interpreter/vm.hpp @@ -226,6 +226,7 @@ public: const bool enable_os; VM(bool enable_os = true); +// clang-format off #if PK_REGION("Python Equivalents") Str py_str(PyVar obj); // x -> str(x) Str py_repr(PyVar obj); // x -> repr(x) @@ -529,6 +530,7 @@ public: vm->s_data.emplace(p->type, p); } #endif +// clang-format on template Type _find_type_in_cxx_typeid_map() {