Skip to content

Commit 71f37d0

Browse files
junyerjunyer
committed
Clean and format #include directives.
Change-Id: Iba5a0f3a18245a22f68ba1c3d533200cc577a596 Reviewed-on: https://code-review.googlesource.com/c/re2/+/63130 Reviewed-by: Alex Chernyakhovsky <[email protected]> Reviewed-by: Paul Wankadia <[email protected]>
1 parent 9d2c825 commit 71f37d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+207
-123
lines changed

‎BUILD.bazel

+7
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ cc_library(
8383
"@abseil-cpp//absl/container:flat_hash_map",
8484
"@abseil-cpp//absl/container:flat_hash_set",
8585
"@abseil-cpp//absl/container:inlined_vector",
86+
"@abseil-cpp//absl/hash",
8687
"@abseil-cpp//absl/log:absl_check",
8788
"@abseil-cpp//absl/log:absl_log",
8889
"@abseil-cpp//absl/strings",
@@ -165,6 +166,7 @@ cc_test(
165166
"@abseil-cpp//absl/base:core_headers",
166167
"@abseil-cpp//absl/log:absl_check",
167168
"@abseil-cpp//absl/log:absl_log",
169+
"@abseil-cpp//absl/strings",
168170
"@googletest//:gtest",
169171
"@googletest//:gtest_main",
170172
],
@@ -239,6 +241,7 @@ cc_test(
239241
"@abseil-cpp//absl/base:core_headers",
240242
"@abseil-cpp//absl/log:absl_check",
241243
"@abseil-cpp//absl/log:absl_log",
244+
"@abseil-cpp//absl/types:optional",
242245
"@googletest//:gtest",
243246
"@googletest//:gtest_main",
244247
],
@@ -254,6 +257,7 @@ cc_test(
254257
"@abseil-cpp//absl/base:core_headers",
255258
"@abseil-cpp//absl/log:absl_check",
256259
"@abseil-cpp//absl/log:absl_log",
260+
"@abseil-cpp//absl/strings",
257261
"@abseil-cpp//absl/strings:str_format",
258262
"@googletest//:gtest",
259263
"@googletest//:gtest_main",
@@ -333,6 +337,7 @@ cc_test(
333337
srcs = ["re2/testing/string_generator_test.cc"],
334338
deps = [
335339
":testing",
340+
"@abseil-cpp//absl/strings",
336341
"@googletest//:gtest",
337342
"@googletest//:gtest_main",
338343
],
@@ -349,6 +354,7 @@ cc_test(
349354
"@abseil-cpp//absl/flags:flag",
350355
"@abseil-cpp//absl/log:absl_check",
351356
"@abseil-cpp//absl/log:absl_log",
357+
"@abseil-cpp//absl/strings",
352358
"@abseil-cpp//absl/strings:str_format",
353359
"@googletest//:gtest",
354360
"@googletest//:gtest_main",
@@ -423,6 +429,7 @@ cc_binary(
423429
"@abseil-cpp//absl/flags:flag",
424430
"@abseil-cpp//absl/log:absl_check",
425431
"@abseil-cpp//absl/log:absl_log",
432+
"@abseil-cpp//absl/strings",
426433
"@abseil-cpp//absl/strings:str_format",
427434
"@abseil-cpp//absl/synchronization",
428435
"@google_benchmark//:benchmark_main",

‎CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ set(ABSL_DEPS
6868
absl_flags
6969
absl_flat_hash_map
7070
absl_flat_hash_set
71+
absl_hash
7172
absl_inlined_vector
7273
absl_optional
7374
absl_span

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ABSL_DEPS=\
1212
absl_flags\
1313
absl_flat_hash_map\
1414
absl_flat_hash_set\
15+
absl_hash\
1516
absl_inlined_vector\
1617
absl_optional\
1718
absl_span\

‎python/_re2.cc

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5+
#include <stddef.h>
6+
#include <sys/types.h>
7+
58
#include <memory>
9+
#include <stdexcept>
610
#include <string>
711
#include <tuple>
812
#include <utility>
913
#include <vector>
1014

11-
#include <pybind11/pybind11.h>
12-
#include <pybind11/stl.h>
1315
#include "absl/strings/string_view.h"
16+
#include "pybind11/buffer_info.h"
17+
#include "pybind11/gil.h"
18+
#include "pybind11/pybind11.h"
19+
#include "pybind11/pytypes.h"
1420
#include "re2/filtered_re2.h"
1521
#include "re2/re2.h"
1622
#include "re2/set.h"

‎re2/bitmap256.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66

77
#include <stdint.h>
88

9-
#include "absl/base/macros.h"
9+
#include "absl/base/attributes.h"
1010
#include "absl/log/absl_check.h"
11-
#include "absl/log/absl_log.h"
1211

1312
namespace re2 {
1413

‎re2/bitmap256.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
#ifndef RE2_BITMAP256_H_
66
#define RE2_BITMAP256_H_
77

8-
#ifdef _MSC_VER
9-
#include <intrin.h>
10-
#endif
118
#include <stdint.h>
129
#include <string.h>
1310

1411
#include "absl/log/absl_check.h"
1512
#include "absl/log/absl_log.h"
1613

14+
#ifdef _MSC_VER
15+
#include <intrin.h>
16+
#endif
17+
1718
namespace re2 {
1819

1920
class Bitmap256 {

‎re2/bitstate.cc

+2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
#include <stddef.h>
2121
#include <stdint.h>
2222
#include <string.h>
23+
2324
#include <limits>
2425
#include <utility>
2526

2627
#include "absl/log/absl_check.h"
2728
#include "absl/log/absl_log.h"
29+
#include "absl/strings/string_view.h"
2830
#include "re2/pod_array.h"
2931
#include "re2/prog.h"
3032
#include "re2/regexp.h"

‎re2/compile.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,20 @@
1010

1111
#include <stdint.h>
1212
#include <string.h>
13+
14+
#include <string>
1315
#include <utility>
1416

15-
#include "absl/base/macros.h"
1617
#include "absl/container/flat_hash_map.h"
1718
#include "absl/log/absl_check.h"
1819
#include "absl/log/absl_log.h"
19-
#include "util/utf.h"
20+
#include "absl/strings/string_view.h"
2021
#include "re2/pod_array.h"
2122
#include "re2/prog.h"
2223
#include "re2/re2.h"
2324
#include "re2/regexp.h"
2425
#include "re2/walker-inl.h"
26+
#include "util/utf.h"
2527

2628
namespace re2 {
2729

‎re2/dfa.cc

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,32 @@
2525
#include <stdint.h>
2626
#include <stdio.h>
2727
#include <string.h>
28+
2829
#include <algorithm>
2930
#include <atomic>
3031
#include <deque>
31-
#include <new>
32+
#include <memory>
3233
#include <string>
3334
#include <utility>
3435
#include <vector>
3536

37+
#include "absl/base/attributes.h"
3638
#include "absl/base/call_once.h"
37-
#include "absl/base/macros.h"
3839
#include "absl/base/thread_annotations.h"
3940
#include "absl/container/flat_hash_map.h"
4041
#include "absl/container/flat_hash_set.h"
42+
#include "absl/hash/hash.h"
4143
#include "absl/log/absl_check.h"
4244
#include "absl/log/absl_log.h"
4345
#include "absl/strings/str_format.h"
46+
#include "absl/strings/string_view.h"
4447
#include "absl/synchronization/mutex.h"
4548
#include "absl/types/span.h"
46-
#include "util/strutil.h"
4749
#include "re2/pod_array.h"
4850
#include "re2/prog.h"
4951
#include "re2/re2.h"
5052
#include "re2/sparse_set.h"
53+
#include "util/strutil.h"
5154

5255
// Silence "zero-sized array in struct/union" warning for DFA::State::next_.
5356
#ifdef _MSC_VER

‎re2/filtered_re2.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
#include "re2/filtered_re2.h"
66

77
#include <stddef.h>
8+
89
#include <string>
910
#include <utility>
11+
#include <vector>
1012

11-
#include "absl/log/absl_check.h"
1213
#include "absl/log/absl_log.h"
14+
#include "absl/strings/string_view.h"
1315
#include "re2/prefilter.h"
1416
#include "re2/prefilter_tree.h"
1517

‎re2/fuzzing/re2_fuzzer.cc

+2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
#include <fuzzer/FuzzedDataProvider.h>
66
#include <stddef.h>
77
#include <stdint.h>
8+
89
#include <algorithm>
910
#include <string>
1011
#include <vector>
1112

13+
#include "absl/strings/string_view.h"
1214
#include "re2/filtered_re2.h"
1315
#include "re2/re2.h"
1416
#include "re2/regexp.h"

‎re2/mimics_pcre.cc

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
//
2323
// Regexp::MimicsPCRE checks for any of these conditions.
2424

25-
#include "absl/log/absl_check.h"
2625
#include "absl/log/absl_log.h"
2726
#include "re2/regexp.h"
2827
#include "re2/walker-inl.h"

‎re2/nfa.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626

2727
#include <stdio.h>
2828
#include <string.h>
29+
2930
#include <algorithm>
3031
#include <deque>
3132
#include <string>
3233
#include <utility>
33-
#include <vector>
3434

3535
#include "absl/log/absl_check.h"
3636
#include "absl/log/absl_log.h"
3737
#include "absl/strings/str_format.h"
38+
#include "absl/strings/string_view.h"
3839
#include "re2/pod_array.h"
3940
#include "re2/prog.h"
4041
#include "re2/regexp.h"

‎re2/onepass.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,21 @@
5252

5353
#include <stdint.h>
5454
#include <string.h>
55+
5556
#include <algorithm>
5657
#include <map>
5758
#include <string>
58-
#include <vector>
5959

6060
#include "absl/container/fixed_array.h"
6161
#include "absl/container/inlined_vector.h"
6262
#include "absl/log/absl_check.h"
6363
#include "absl/log/absl_log.h"
6464
#include "absl/strings/str_format.h"
65-
#include "util/utf.h"
65+
#include "absl/strings/string_view.h"
6666
#include "re2/pod_array.h"
6767
#include "re2/prog.h"
6868
#include "re2/sparse_set.h"
69+
#include "util/utf.h"
6970

7071
// Silence "zero-sized array in struct/union" warning for OneState::action.
7172
#ifdef _MSC_VER

‎re2/parse.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@
1616
// and recognizes the Perl escape sequences \d, \s, \w, \D, \S, and \W.
1717
// See regexp.h for rationale.
1818

19-
#include <ctype.h>
2019
#include <stddef.h>
2120
#include <stdint.h>
2221
#include <string.h>
22+
2323
#include <algorithm>
24-
#include <map>
2524
#include <string>
2625
#include <vector>
2726

27+
#include "absl/base/attributes.h"
2828
#include "absl/base/macros.h"
29-
#include "absl/log/absl_check.h"
3029
#include "absl/log/absl_log.h"
3130
#include "absl/strings/ascii.h"
32-
#include "util/utf.h"
31+
#include "absl/strings/string_view.h"
3332
#include "re2/pod_array.h"
3433
#include "re2/regexp.h"
3534
#include "re2/unicode_casefold.h"
3635
#include "re2/unicode_groups.h"
3736
#include "re2/walker-inl.h"
37+
#include "util/utf.h"
3838

3939
#if defined(RE2_USE_ICU)
4040
#include "unicode/uniset.h"

‎re2/prefilter.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55
#include "re2/prefilter.h"
66

77
#include <stddef.h>
8-
#include <stdint.h>
8+
99
#include <string>
1010
#include <utility>
1111
#include <vector>
1212

1313
#include "absl/log/absl_check.h"
1414
#include "absl/log/absl_log.h"
1515
#include "absl/strings/str_format.h"
16-
#include "util/utf.h"
1716
#include "re2/re2.h"
17+
#include "re2/regexp.h"
1818
#include "re2/unicode_casefold.h"
1919
#include "re2/walker-inl.h"
20+
#include "util/utf.h"
2021

2122
namespace re2 {
2223

‎re2/prefilter_tree.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include "re2/prefilter_tree.h"
66

77
#include <stddef.h>
8+
89
#include <algorithm>
910
#include <cmath>
10-
#include <memory>
1111
#include <string>
1212
#include <utility>
1313
#include <vector>
@@ -16,7 +16,6 @@
1616
#include "absl/log/absl_log.h"
1717
#include "absl/strings/str_format.h"
1818
#include "re2/prefilter.h"
19-
#include "re2/re2.h"
2019

2120
namespace re2 {
2221

‎re2/prog.cc

+15-8
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,30 @@
77

88
#include "re2/prog.h"
99

10-
#if defined(__AVX2__)
11-
#include <immintrin.h>
12-
#ifdef _MSC_VER
13-
#include <intrin.h>
14-
#endif
15-
#endif
1610
#include <stdint.h>
1711
#include <string.h>
12+
1813
#include <algorithm>
19-
#include <memory>
14+
#include <string>
2015
#include <utility>
16+
#include <vector>
2117

22-
#include "absl/base/macros.h"
18+
#include "absl/base/attributes.h"
2319
#include "absl/log/absl_check.h"
2420
#include "absl/log/absl_log.h"
2521
#include "absl/strings/str_format.h"
22+
#include "absl/strings/string_view.h"
2623
#include "re2/bitmap256.h"
24+
#include "re2/pod_array.h"
25+
#include "re2/sparse_array.h"
26+
#include "re2/sparse_set.h"
27+
28+
#if defined(__AVX2__)
29+
#include <immintrin.h>
30+
#ifdef _MSC_VER
31+
#include <intrin.h>
32+
#endif
33+
#endif
2734

2835
namespace re2 {
2936

0 commit comments

Comments
 (0)