Clean up libime include order and modernize for C++20 (#104)

Author: wengxt

.clang-format

@@ -41,6 +41,7 @@ Standard:        Cpp11
 IndentWidth:     4
 TabWidth:        4
 UseTab:          Never
+LineEnding:      LF
 BreakBeforeBraces: Attach
 SpacesInParentheses: false
 SpacesInAngles:  false
@@ -51,9 +52,28 @@ SpaceBeforeAssignmentOperators: true
 ContinuationIndentWidth: 4
 CommentPragmas:  '^ IWYU pragma:'
 ForEachMacros:   [ Q_FOREACH, BOOST_FOREACH ]
+AttributeMacros: [ LIBIMECORE_EXPORT, LIBIMETABLE_EXPORT, LIBIMEPINYIN_EXPORT ]
 SpaceBeforeParens: ControlStatements
 DisableFormat:   false
 SortIncludes: true
-AttributeMacros: [ LIBIMECORE_EXPORT, LIBIMETABLE_EXPORT, LIBIMEPINYIN_EXPORT ]
+IncludeCategories:
+  # C system headers.
+  - Regex:    '^[<"](aio|arpa/inet|assert|complex|cpio|ctype|curses|dirent|dlfcn|errno|fcntl|fenv|float|fmtmsg|fnmatch|ftw|glob|grp|iconv|inttypes|iso646|langinfo|libgen|limits|locale|math|monetary|mqueue|ndbm|netdb|net/if|netinet/in|netinet/tcp|nl_types|poll|pthread|pwd|regex|sched|search|semaphore|setjmp|signal|spawn|stdalign|stdarg|stdatomic|stdbool|stddef|stdint|stdio|stdlib|stdnoreturn|string|strings|stropts|sys/ipc|syslog|sys/mman|sys/msg|sys/resource|sys/select|sys/sem|sys/shm|sys/socket|sys/stat|sys/statvfs|sys/time|sys/times|sys/types|sys/uio|sys/un|sys/utsname|sys/wait|tar|term|termios|tgmath|threads|time|trace|uchar|ulimit|uncntrl|unistd|utime|utmpx|wchar|wctype|wordexp)\.h[">]$'
+    Priority: 20
+  # C++ system headers (as of C++23).
+  - Regex:    '^[<"](algorithm|any|array|atomic|barrier|bit|bitset|cassert|ccomplex|cctype|cerrno|cfenv|cfloat|charconv|chrono|cinttypes|ciso646|climits|clocale|cmath|codecvt|compare|complex|concepts|condition_variable|coroutine|csetjmp|csignal|cstdalign|cstdarg|cstdbool|cstddef|cstdint|cstdio|cstdlib|cstring|ctgmath|ctime|cuchar|cwchar|cwctype|deque|exception|execution|expected|filesystem|flat_map|flat_set|format|forward_list|fstream|functional|future|generator|initializer_list|iomanip|ios|iosfwd|iostream|istream|iterator|latch|limits|list|locale|map|mdspan|memory|memory_resource|mutex|new|numbers|numeric|optional|ostream|print|queue|random|ranges|ratio|regex|scoped_allocator|semaphore|set|shared_mutex|source_location|span|spanstream|sstream|stack|stacktrace|stdexcept|stdfloat|stop_token|streambuf|string|string_view|strstream|syncstream|system_error|thread|tuple|type_traits|typeindex|typeinfo|unordered_map|unordered_set|utility|valarray|variant|vector|version)[">]$'
+    Priority: 30
+  # Other libraries' h files (with angles).
+  - Regex:    '^<'
+    Priority: 40
+  # Friend project's h files.
+  - Regex:    '^[<"]fcitx'
+    Priority: 44
+  # Your project's h files.
+  - Regex:    '^[<"]libime'
+    Priority: 45
+  # Other libraries' h files (with quotes).
+  - Regex:    '^"'
+    Priority: 50
 ...
 

src/libime/core/datrie.cpp

@@ -11,16 +11,13 @@
 // <ynaga@tkl.iis.u-tokyo.ac.jp>
 
 #include "datrie.h"
-#include "naivevector.h"
-#include "utils.h"
-#include "utils_p.h"
+#include <sys/types.h>
 #include <algorithm>
 #include <array>
 #include <cassert>
 #include <cmath>
 #include <cstdint>
 #include <cstring>
-#include <fcitx-utils/macros.h>
 #include <fstream>
 #include <ios>
 #include <istream>
@@ -32,9 +29,11 @@
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <sys/types.h>
 #include <tuple>
 #include <vector>
+#include <fcitx-utils/macros.h>
+#include "naivevector.h"
+#include "utils_p.h"
 
 namespace libime {
 
@@ -1018,6 +1017,10 @@ DATrie<T> &DATrie<T>::operator=(DATrie<T> &&other) noexcept = default;
 
 template <typename T>
 DATrie<T> &DATrie<T>::operator=(const DATrie<T> &other) {
+    if (this == &other) {
+        return *this;
+    }
+
     if (d) {
         *d = *other.d;
     } else {

src/libime/core/datrie.h

@@ -14,7 +14,6 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <fcitx-utils/macros.h>
 #include <functional>
 #include <istream>
 #include <memory>
@@ -23,6 +22,7 @@
 #include <string_view>
 #include <tuple>
 #include <vector>
+#include <fcitx-utils/macros.h>
 
 namespace libime {
 

src/libime/core/decoder.cpp

@@ -5,20 +5,10 @@
  */
 
 #include "decoder.h"
-#include "languagemodel.h"
-#include "lattice.h"
-#include "lattice_p.h"
-#include "segmentgraph.h"
-#include "utils.h"
-#include "utils_p.h"
 #include <algorithm>
-#include <boost/container_hash/hash.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/ptr_container/ptr_vector.hpp>
 #include <cassert>
 #include <chrono>
 #include <cstddef>
-#include <fcitx-utils/macros.h>
 #include <limits>
 #include <memory>
 #include <queue>
@@ -30,6 +20,16 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#include <boost/container_hash/hash.hpp>
+#include <boost/functional/hash.hpp>
+#include <boost/ptr_container/ptr_vector.hpp>
+#include <fcitx-utils/macros.h>
+#include "languagemodel.h"
+#include "lattice.h"
+#include "lattice_p.h"
+#include "segmentgraph.h"
+#include "utils.h"
+#include "utils_p.h"
 
 namespace libime {
 

src/libime/core/decoder.h

@@ -7,16 +7,16 @@
 #define _FCITX_LIBIME_CORE_DECODER_H_
 
 #include <cstddef>
+#include <limits>
+#include <memory>
+#include <string_view>
+#include <utility>
 #include <fcitx-utils/macros.h>
 #include <libime/core/dictionary.h>
 #include <libime/core/languagemodel.h>
 #include <libime/core/lattice.h>
 #include <libime/core/libimecore_export.h>
 #include <libime/core/segmentgraph.h>
-#include <limits>
-#include <memory>
-#include <string_view>
-#include <utility>
 
 namespace libime {
 

src/libime/core/dictionary.cpp

@@ -5,8 +5,8 @@
  */
 
 #include "dictionary.h"
-#include "segmentgraph.h"
 #include <unordered_set>
+#include "segmentgraph.h"
 
 void libime::Dictionary::matchPrefix(
     const SegmentGraph &graph, const GraphMatchCallback &callback,

src/libime/core/dictionary.h

@@ -7,11 +7,11 @@
 #define _FCITX_LIBIME_CORE_DICTIONARY_H_
 
 #include <functional>
+#include <memory>
+#include <unordered_set>
 #include <libime/core/lattice.h>
 #include <libime/core/libimecore_export.h>
 #include <libime/core/segmentgraph.h>
-#include <memory>
-#include <unordered_set>
 
 namespace libime {
 

src/libime/core/historybigram.cpp

@@ -4,19 +4,12 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 #include "historybigram.h"
-#include "constants.h"
-#include "datrie.h"
-#include "lattice.h"
-#include "utils_p.h"
-#include "zstdfilter.h"
 #include <algorithm>
 #include <array>
 #include <cassert>
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
-#include <fcitx-utils/macros.h>
-#include <fcitx-utils/stringutils.h>
 #include <functional>
 #include <istream>
 #include <iterator>
@@ -30,6 +23,13 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#include <fcitx-utils/macros.h>
+#include <fcitx-utils/stringutils.h>
+#include "constants.h"
+#include "datrie.h"
+#include "lattice.h"
+#include "utils_p.h"
+#include "zstdfilter.h"
 
 namespace libime {
 

src/libime/core/historybigram.h

@@ -7,16 +7,16 @@
 #define _FCITX_LIBIME_CORE_HISTORYBIGRAM_H_
 
 #include <cstddef>
-#include <fcitx-utils/macros.h>
 #include <istream>
-#include <libime/core/lattice.h>
-#include <libime/core/libimecore_export.h>
 #include <memory>
 #include <ostream>
 #include <string>
 #include <string_view>
 #include <unordered_set>
 #include <vector>
+#include <fcitx-utils/macros.h>
+#include <libime/core/lattice.h>
+#include <libime/core/libimecore_export.h>
 
 namespace libime {
 

src/libime/core/inputbuffer.cpp

@@ -5,8 +5,8 @@
  */
 #include "inputbuffer.h"
 #include <cstddef>
-#include <fcitx-utils/utf8.h>
 #include <string_view>
+#include <fcitx-utils/utf8.h>
 
 namespace libime {