fix the clang-format header order patterns

ggeorgiev · May 28, 2016 · 44271e4 · 44271e4
1 parent 29a6af6
commit 44271e4
Show file tree

Hide file tree

Showing 31 changed files with 70 additions and 58 deletions.
diff --git a/.clang-format b/.clang-format
@@ -46,51 +46,63 @@ DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 IncludeCategories:
-  - Regex:           '^"engine/*.'
+  - Regex:           '^"engine/.*'
     Priority:        0
-  - Regex:           '^"tool/*.'
+  - Regex:           '^"tool/.*'
     Priority:        10
-  - Regex:           '^"task/*.'
+
+  - Regex:           '^"task/[^/]*$'
+    Priority:        21
+  - Regex:           '^"task/.*'
     Priority:        20
-  - Regex:           '^"tpool/*.'
+
+  - Regex:           '^"tpool/.*'
     Priority:        30
-  - Regex:           '^"parser/*.'
+  - Regex:           '^"parser/.*'
     Priority:        40
-  - Regex:           '^"dom/*.'
+
+  - Regex:           '^"dom/[^/]*$'
+    Priority:        51
+  - Regex:           '^"dom/.*'
     Priority:        50
-  - Regex:           '^"option/*.'
+
+  - Regex:           '^"option/.*'
     Priority:        60
-  - Regex:           '^"doim/*.'
+
+  - Regex:           '^"doim/[^/]*$'
+    Priority:        71
+  - Regex:           '^"doim/.*'
     Priority:        70
-  - Regex:           '^"dp/*.'
+
+  - Regex:           '^"dp/.*'
     Priority:        80
-  - Regex:           '^"db/*.'
+  - Regex:           '^"db/.*'
     Priority:        90
-  - Regex:           '^"err/*.'
+  - Regex:           '^"err/.*'
     Priority:        90
-  - Regex:           '^"log/*.'
+  - Regex:           '^"log/.*'
     Priority:        100
-  - Regex:           '^"im/*.'
+  - Regex:           '^"im/.*'
     Priority:        100
-  - Regex:           '^"const/*.'
+  - Regex:           '^"const/.*'
     Priority:        110
-  - Regex:           '^"rtti/*.'
+  - Regex:           '^"rtti/.*'
     Priority:        110
-  - Regex:           '^"gtest/*.'
+  - Regex:           '^"gtest/.*'
     Priority:        120
-  - Regex:           '^<gtest/*.'
+  - Regex:           '^<gtest/.*'
     Priority:        130
 #Note: that cppformat has to be on top of spdlog, even the real dependency is the opposite
 #      we need this to be able to override the internal version of spdlog
-  - Regex:           '^<fmt/*.'
+  - Regex:           '^<fmt/.*'
     Priority:        140
-  - Regex:           '^<spdlog/details/*.'
+  - Regex:           '^<spdlog/details/.*'
     Priority:        151
-  - Regex:           '^<spdlog/*.'
+  - Regex:           '^<spdlog/.*'
     Priority:        150
-  - Regex:           '^<boost/*.'
+  - Regex:           '^<boost/.*'
     Priority:        150
-  - Regex:           '^<rocksdb/*.'
+  - Regex:           '^<rocksdb/.*'
     Priority:        150
   - Regex:           '^".*"$'
     Priority:        1000

diff --git a/src/doim/cxx/cxx_file.h b/src/doim/cxx/cxx_file.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include "doim/cxx/cxx_include_directory.h"
-#include "doim/element.hpp"
 #include "doim/fs/fs_file.h"
+#include "doim/element.hpp"
 #include "doim/set.hpp"
 #include <memory>
 #include <tuple>

diff --git a/src/doim/cxx/cxx_header.h b/src/doim/cxx/cxx_header.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include "doim/cxx/cxx_include_directory.h"
-#include "doim/element.hpp"
 #include "doim/fs/fs_file.h"
+#include "doim/element.hpp"
 #include "doim/set.hpp"
 #include <iosfwd>
 #include <memory>

diff --git a/src/doim/cxx/cxx_include_directory.h b/src/doim/cxx/cxx_include_directory.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "doim/element.hpp"
 #include "doim/fs/fs_directory.h"
 #include "doim/fs/fs_file.h"
+#include "doim/element.hpp"
 #include "doim/set.hpp"
 #include "err/err.h"
 #include <iosfwd>

diff --git a/src/doim/cxx/cxx_object_file.h b/src/doim/cxx/cxx_object_file.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include "doim/cxx/cxx_file.h"
-#include "doim/element.hpp"
 #include "doim/fs/fs_file.h"
+#include "doim/element.hpp"
 #include "doim/set.hpp"
 #include <memory>
 #include <tuple>

diff --git a/src/doim/cxx/cxx_program.h b/src/doim/cxx/cxx_program.h
@@ -5,8 +5,8 @@
 
 #include "doim/cxx/cxx_object_file.h"
 #include "doim/cxx/cxx_static_library.h"
-#include "doim/element.hpp"
 #include "doim/fs/fs_file.h"
+#include "doim/element.hpp"
 #include "doim/set.hpp"
 #include <memory>
 #include <tuple>

diff --git a/src/doim/cxx/cxx_static_library.h b/src/doim/cxx/cxx_static_library.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "doim/element.hpp"
 #include "doim/fs/fs_file.h"
+#include "doim/element.hpp"
 #include "doim/set.hpp"
 #include <memory>
 #include <tuple>

diff --git a/src/doim/fs/fs_file.h b/src/doim/fs/fs_file.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "doim/element.hpp"
 #include "doim/fs/fs_directory.h"
+#include "doim/element.hpp"
 #include "doim/set.hpp"
 #include <memory>
 #include <str>

diff --git a/src/doim/generic/attribute.h b/src/doim/generic/attribute.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "doim/element.hpp"
 #include "doim/generic/attribute_name.h"
 #include "doim/generic/attribute_value.h"
+#include "doim/element.hpp"
 #include "doim/set.hpp"
 #include <memory>
 #include <tuple>

diff --git a/src/doim/generic/object.h b/src/doim/generic/object.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "doim/element.hpp"
 #include "doim/generic/location.hpp"
+#include "doim/element.hpp"
 #include <memory>
 #include <str>
 #include <string_view>

diff --git a/src/doim/sys/sys_command.cpp b/src/doim/sys/sys_command.cpp
@@ -2,8 +2,8 @@
 //
 
 #include "doim/sys/sys_command.h"
-#include "doim/set.hpp"
 #include "doim/sys/sys_argument.h"
+#include "doim/set.hpp"
 #include "err/err_assert.h"
 #include <algorithm>
 #include <functional>

diff --git a/src/doim/sys/sys_command.h b/src/doim/sys/sys_command.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "doim/element.hpp"
 #include "doim/sys/sys_argument.h"
 #include "doim/sys/sys_executable.h"
+#include "doim/element.hpp"
 #include "dp/simple_memoization.hpp"
 #include <memory>
 #include <str>

diff --git a/src/doim/sys/sys_executable.h b/src/doim/sys/sys_executable.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "doim/element.hpp"
 #include "doim/fs/fs_binary.h"
 #include "doim/fs/fs_file.h"
+#include "doim/element.hpp"
 #include <memory>
 #include <str>
 

diff --git a/src/engine/cxx_engine.cpp b/src/engine/cxx_engine.cpp
@@ -7,15 +7,15 @@
 #include "task/cxx/cxx_object_file_crc_task.h"
 #include "task/cxx/cxx_program_crc_task.h"
 #include "task/db/db_put_task.h"
-#include "task/manager.h"
 #include "task/sys/parse_stdout_task.h"
+#include "task/manager.h"
 #include "task/tpool.h"
 #include "tpool/task_callback.h"
 #include "tpool/task_group.h"
 #include "doim/cxx/cxx_program.h"
 #include "doim/fs/fs_file.h"
-#include "doim/set.hpp"
 #include "doim/sys/sys_command.h"
+#include "doim/set.hpp"
 #include "db/database.h"
 #include "err/err.h"
 #include "im/initialization_manager.hpp"

diff --git a/src/task/cxx/cxx_file_crc_task.h b/src/task/cxx/cxx_file_crc_task.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "task/base.hpp"
 #include "task/cxx/cxx_crc_task_mixin.h"
+#include "task/element.hpp"
 #include "doim/cxx/cxx_file.h"
 #include "doim/tag/tag.h"
 #include "err/err.h"

diff --git a/src/task/cxx/cxx_header_crc_task.h b/src/task/cxx/cxx_header_crc_task.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "task/base.hpp"
 #include "task/cxx/cxx_crc_task_mixin.h"
+#include "task/element.hpp"
 #include "doim/cxx/cxx_header.h"
 #include "doim/cxx/cxx_include_directory.h"
 #include "doim/tag/tag.h"

diff --git a/src/task/cxx/cxx_object_file_crc_task.h b/src/task/cxx/cxx_object_file_crc_task.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "task/base.hpp"
+#include "task/element.hpp"
 #include "doim/cxx/cxx_object_file.h"
 #include "doim/tag/tag.h"
 #include "err/err.h"

diff --git a/src/task/cxx/cxx_program_crc_task.h b/src/task/cxx/cxx_program_crc_task.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "task/base.hpp"
+#include "task/element.hpp"
 #include "doim/cxx/cxx_program.h"
 #include "doim/tag/tag.h"
 #include "err/err.h"

diff --git a/src/task/db/db_put_task.h b/src/task/db/db_put_task.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "task/base.hpp"
+#include "task/element.hpp"
 #include "doim/db/db_key.h"
 #include "doim/db/db_value.hpp"
 #include "doim/tag/tag.h"

diff --git a/src/task/base.hpp → src/task/element.hpp b/src/task/base.hpp → src/task/element.hpp
diff --git a/src/task/manager.h b/src/task/manager.h
@@ -3,16 +3,16 @@
 
 #pragma once
 
-#include "task/base.hpp"
 #include "task/cxx/cxx_file_crc_task.h"
 #include "task/cxx/cxx_header_crc_task.h"
 #include "task/cxx/cxx_object_file_crc_task.h"
 #include "task/cxx/cxx_program_crc_task.h"
 #include "task/sys/ensure_directory_task.h"
 #include "task/sys/execute_command_task.h"
 #include "task/sys/parse_stdout_task.h"
+#include "task/element.hpp"
 #include "im/initialization_manager.hpp"
-#include <mutex>
+#include <mutex> // IWYU pragma: keep
 #include <shared_ptr>
 #include <unordered>
 

diff --git a/src/task/sys/ensure_directory_task.h b/src/task/sys/ensure_directory_task.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "task/base.hpp"
+#include "task/element.hpp"
 #include "doim/fs/fs_directory.h"
 #include "err/err.h"
 #include <fmt/format.h>

diff --git a/src/task/sys/execute_command_task.cpp b/src/task/sys/execute_command_task.cpp
@@ -2,8 +2,8 @@
 //
 
 #include "task/sys/execute_command_task.h"
-#include "task/manager.h"
 #include "task/sys/ensure_directory_task.h"
+#include "task/manager.h"
 #include "task/tpool.h"
 
 #include "db/database.h"

diff --git a/src/task/sys/execute_command_task.h b/src/task/sys/execute_command_task.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "task/base.hpp"
+#include "task/element.hpp"
 #include "doim/fs/fs_directory.h"
 #include "doim/sys/sys_command.h"
 #include "doim/tag/tag.h"

diff --git a/src/task/sys/parse_stdout_task.cpp b/src/task/sys/parse_stdout_task.cpp
@@ -2,8 +2,8 @@
 //
 
 #include "task/sys/parse_stdout_task.h"
-#include "task/manager.h"
 #include "task/sys/execute_command_task.h"
+#include "task/manager.h"
 #include "task/tpool.h"
 
 #include "err/err_assert.h"

diff --git a/src/task/sys/parse_stdout_task.h b/src/task/sys/parse_stdout_task.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "task/base.hpp"
+#include "task/element.hpp"
 #include "doim/fs/fs_directory.h"
 #include "doim/sys/sys_command.h"
 #include "err/err.h"

diff --git a/src/task/task.dbs b/src/task/task.dbs
@@ -5,7 +5,7 @@ cxx_library task
         @visibility=public
         @directory=..:
 
-        task/base.hpp
+        task/element.hpp
         task/cxx/cxx_crc_task_mixin.h
         task/cxx/cxx_file_crc_task.h
         task/cxx/cxx_header_crc_task.h

diff --git a/src/tool/cxx_clang_format.cpp b/src/tool/cxx_clang_format.cpp
@@ -2,12 +2,12 @@
 //
 
 #include "tool/cxx_clang_format.h"
-#include "task/manager.h"
 #include "task/sys/parse_stdout_task.h"
+#include "task/manager.h"
 #include "doim/cxx/cxx_file.h"
 #include "doim/fs/fs_file.h"
-#include "doim/set.hpp"
 #include "doim/sys/sys_command.h"
+#include "doim/set.hpp"
 #include "rtti/class_rtti.hpp"
 #include <memory>
 #include <str>

diff --git a/src/tool/cxx_compiler.cpp b/src/tool/cxx_compiler.cpp
@@ -5,9 +5,9 @@
 #include "doim/cxx/cxx_file.h"
 #include "doim/cxx/cxx_static_library.h"
 #include "doim/fs/fs_file.h"
-#include "doim/set.hpp"
 #include "doim/sys/sys_argument.h"
 #include "doim/sys/sys_command.h"
+#include "doim/set.hpp"
 #include <memory>
 #include <str>
 

diff --git a/src/tool/cxx_iwyu.cpp b/src/tool/cxx_iwyu.cpp
@@ -3,15 +3,15 @@
 
 #include "tool/cxx_iwyu.h"
 #include "tool/cxx_compiler.h"
-#include "task/manager.h"
 #include "task/sys/parse_stdout_task.h"
+#include "task/manager.h"
 #include "doim/cxx/cxx_file.h"
 #include "doim/cxx/cxx_header.h"
 #include "doim/cxx/cxx_include_directory.h"
 #include "doim/fs/fs_file.h"
-#include "doim/set.hpp"
 #include "doim/sys/sys_argument.h"
 #include "doim/sys/sys_command.h"
+#include "doim/set.hpp"
 #include "err/err.h"
 #include "log/log.h"
 #include "rtti/class_rtti.hpp"