Skip to content

Commit 1973274

Browse files
stragerstrager
committed
refactor: rename ERROR_* matcher macros -> DIAG_*
1 parent 451d434 commit 1973274

18 files changed

+1075
-1078
lines changed

‎test/quick-lint-js/error-matcher.h‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -16,106 +16,106 @@
1616
#include <quick-lint-js/padded-string.h>
1717
#include <vector>
1818

19-
#define ERROR_TYPE_FIELD(diag_type, member, matcher) \
20-
::testing::VariantWith<diag_type>( \
19+
#define DIAG_TYPE_FIELD(diag_type, member, matcher) \
20+
::testing::VariantWith<diag_type>( \
2121
::testing::Field(#member, &diag_type::member, matcher))
2222

23-
#define ERROR_TYPE_2_FIELDS(diag_type, member_1, matcher_1, member_2, \
24-
matcher_2) \
25-
::testing::VariantWith<diag_type>(::testing::AllOf( \
26-
::testing::Field(#member_1, &diag_type::member_1, matcher_1), \
23+
#define DIAG_TYPE_2_FIELDS(diag_type, member_1, matcher_1, member_2, \
24+
matcher_2) \
25+
::testing::VariantWith<diag_type>(::testing::AllOf( \
26+
::testing::Field(#member_1, &diag_type::member_1, matcher_1), \
2727
::testing::Field(#member_2, &diag_type::member_2, matcher_2)))
2828

29-
#define ERROR_TYPE_3_FIELDS(diag_type, member_1, matcher_1, member_2, \
30-
matcher_2, member_3, matcher_3) \
31-
::testing::VariantWith<diag_type>(::testing::AllOf( \
32-
::testing::Field(#member_1, &diag_type::member_1, matcher_1), \
33-
::testing::Field(#member_2, &diag_type::member_2, matcher_2), \
29+
#define DIAG_TYPE_3_FIELDS(diag_type, member_1, matcher_1, member_2, \
30+
matcher_2, member_3, matcher_3) \
31+
::testing::VariantWith<diag_type>(::testing::AllOf( \
32+
::testing::Field(#member_1, &diag_type::member_1, matcher_1), \
33+
::testing::Field(#member_2, &diag_type::member_2, matcher_2), \
3434
::testing::Field(#member_3, &diag_type::member_3, matcher_3)))
3535

3636
// Equivalent to ::testing::VariantWith<type>(::testing::_), but compiles much
3737
// more quickly.
38-
#define ERROR_TYPE(type) \
38+
#define DIAG_TYPE(type) \
3939
::quick_lint_js::diag_matcher(::quick_lint_js::diag_type::type)
4040

4141
// Equivalent to the following, but compiles much more quickly:
4242
//
43-
// ERROR_TYPE_FIELD(type, member_0,
43+
// DIAG_TYPE_FIELD(type, member_0,
4444
// offsets_matcher(code, start_0, end_or_text_0))
4545
//
4646
// but compiles much more quickly.
47-
#define ERROR_TYPE_OFFSETS(code, type, member_0, start_0, end_or_text_0) \
48-
::quick_lint_js::diag_matcher( \
49-
code, ::quick_lint_js::diag_type::type, \
50-
::quick_lint_js::diag_matcher::field{ \
51-
#member_0, \
52-
offsetof(type, member_0), \
53-
::quick_lint_js::get_error_matcher_field_type<decltype( \
54-
type::member_0)>(), \
55-
start_0, \
56-
end_or_text_0, \
47+
#define DIAG_TYPE_OFFSETS(code, type, member_0, start_0, end_or_text_0) \
48+
::quick_lint_js::diag_matcher( \
49+
code, ::quick_lint_js::diag_type::type, \
50+
::quick_lint_js::diag_matcher::field{ \
51+
#member_0, \
52+
offsetof(type, member_0), \
53+
::quick_lint_js::get_error_matcher_field_type<decltype( \
54+
type::member_0)>(), \
55+
start_0, \
56+
end_or_text_0, \
5757
})
5858

5959
// Equivalent to the following, but compiles much more quickly:
6060
//
61-
// ERROR_TYPE_FIELD(type,
61+
// DIAG_TYPE_FIELD(type,
6262
// member_0, offsets_matcher(code, start_0, end_or_text_0),
6363
// member_1, offsets_matcher(code, start_1, end_or_text_1))
64-
#define ERROR_TYPE_2_OFFSETS(code, type, member_0, start_0, end_or_text_0, \
65-
member_1, start_1, end_or_text_1) \
66-
::quick_lint_js::diag_matcher( \
67-
code, ::quick_lint_js::diag_type::type, \
68-
::quick_lint_js::diag_matcher::field{ \
69-
#member_0, \
70-
offsetof(type, member_0), \
71-
::quick_lint_js::get_error_matcher_field_type<decltype( \
72-
type::member_0)>(), \
73-
start_0, \
74-
end_or_text_0, \
75-
}, \
76-
::quick_lint_js::diag_matcher::field{ \
77-
#member_1, \
78-
offsetof(type, member_1), \
79-
::quick_lint_js::get_error_matcher_field_type<decltype( \
80-
type::member_1)>(), \
81-
start_1, \
82-
end_or_text_1, \
64+
#define DIAG_TYPE_2_OFFSETS(code, type, member_0, start_0, end_or_text_0, \
65+
member_1, start_1, end_or_text_1) \
66+
::quick_lint_js::diag_matcher( \
67+
code, ::quick_lint_js::diag_type::type, \
68+
::quick_lint_js::diag_matcher::field{ \
69+
#member_0, \
70+
offsetof(type, member_0), \
71+
::quick_lint_js::get_error_matcher_field_type<decltype( \
72+
type::member_0)>(), \
73+
start_0, \
74+
end_or_text_0, \
75+
}, \
76+
::quick_lint_js::diag_matcher::field{ \
77+
#member_1, \
78+
offsetof(type, member_1), \
79+
::quick_lint_js::get_error_matcher_field_type<decltype( \
80+
type::member_1)>(), \
81+
start_1, \
82+
end_or_text_1, \
8383
})
8484

8585
// Equivalent to the following, but compiles much more quickly:
8686
//
87-
// ERROR_TYPE_FIELD(type,
87+
// DIAG_TYPE_FIELD(type,
8888
// member_0, offsets_matcher(code, start_0, end_or_text_0),
8989
// member_1, offsets_matcher(code, start_1, end_or_text_1),
9090
// member_2, offsets_matcher(code, start_2, end_or_text_2))
91-
#define ERROR_TYPE_3_OFFSETS(code, type, member_0, start_0, end_or_text_0, \
92-
member_1, start_1, end_or_text_1, member_2, \
93-
start_2, end_or_text_2) \
94-
::quick_lint_js::diag_matcher( \
95-
code, ::quick_lint_js::diag_type::type, \
96-
::quick_lint_js::diag_matcher::field{ \
97-
#member_0, \
98-
offsetof(type, member_0), \
99-
::quick_lint_js::get_error_matcher_field_type<decltype( \
100-
type::member_0)>(), \
101-
start_0, \
102-
end_or_text_0, \
103-
}, \
104-
::quick_lint_js::diag_matcher::field{ \
105-
#member_1, \
106-
offsetof(type, member_1), \
107-
::quick_lint_js::get_error_matcher_field_type<decltype( \
108-
type::member_1)>(), \
109-
start_1, \
110-
end_or_text_1, \
111-
}, \
112-
::quick_lint_js::diag_matcher::field{ \
113-
#member_2, \
114-
offsetof(type, member_2), \
115-
::quick_lint_js::get_error_matcher_field_type<decltype( \
116-
type::member_2)>(), \
117-
start_2, \
118-
end_or_text_2, \
91+
#define DIAG_TYPE_3_OFFSETS(code, type, member_0, start_0, end_or_text_0, \
92+
member_1, start_1, end_or_text_1, member_2, \
93+
start_2, end_or_text_2) \
94+
::quick_lint_js::diag_matcher( \
95+
code, ::quick_lint_js::diag_type::type, \
96+
::quick_lint_js::diag_matcher::field{ \
97+
#member_0, \
98+
offsetof(type, member_0), \
99+
::quick_lint_js::get_error_matcher_field_type<decltype( \
100+
type::member_0)>(), \
101+
start_0, \
102+
end_or_text_0, \
103+
}, \
104+
::quick_lint_js::diag_matcher::field{ \
105+
#member_1, \
106+
offsetof(type, member_1), \
107+
::quick_lint_js::get_error_matcher_field_type<decltype( \
108+
type::member_1)>(), \
109+
start_1, \
110+
end_or_text_1, \
111+
}, \
112+
::quick_lint_js::diag_matcher::field{ \
113+
#member_2, \
114+
offsetof(type, member_2), \
115+
::quick_lint_js::get_error_matcher_field_type<decltype( \
116+
type::member_2)>(), \
117+
start_2, \
118+
end_or_text_2, \
119119
})
120120

121121
namespace quick_lint_js {
@@ -170,7 +170,7 @@ class span_matcher {
170170
// A mix of ::testing::VariantWith, ::testing::Field, and offsets_matcher. These
171171
// are combined into one matcher to significantly reduce compile times.
172172
//
173-
// See ERROR_TYPE and ERROR_TYPE_OFFSETS for example usage.
173+
// See DIAG_TYPE and DIAG_TYPE_OFFSETS for example usage.
174174
class diag_matcher {
175175
public:
176176
enum class field_type {
@@ -221,7 +221,7 @@ class diag_matcher {
221221
state state_;
222222
};
223223

224-
// Internal helper for ERROR_TYPE_OFFSETS macros.
224+
// Internal helper for DIAG_TYPE_OFFSETS macros.
225225
template <class>
226226
constexpr diag_matcher::field_type get_error_matcher_field_type() noexcept =
227227
delete;

‎test/test-buffering-diag-reporter.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ TEST(test_buffering_diag_reporter, buffers_all_visits) {
3737
EXPECT_THAT(
3838
collector.errors,
3939
ElementsAre(
40-
ERROR_TYPE_FIELD(diag_let_with_no_bindings, where, span_of(let_code)),
41-
ERROR_TYPE_2_FIELDS(diag_expected_parenthesis_around_if_condition,
42-
where,
43-
span_of(expression_code), //
44-
token, u8'(')));
40+
DIAG_TYPE_FIELD(diag_let_with_no_bindings, where, span_of(let_code)),
41+
DIAG_TYPE_2_FIELDS(diag_expected_parenthesis_around_if_condition,
42+
where,
43+
span_of(expression_code), //
44+
token, u8'(')));
4545
}
4646

4747
TEST(test_buffering_diag_reporter, not_destructing_does_not_leak) {

‎test/test-configuration.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ TEST(test_configuration_json, invalid_json_reports_error) {
476476

477477
// TODO(strager): Check diag_config_json_syntax_error::where.
478478
EXPECT_THAT(errors.errors,
479-
ElementsAre(ERROR_TYPE(diag_config_json_syntax_error)));
479+
ElementsAre(DIAG_TYPE(diag_config_json_syntax_error)));
480480
}
481481
}
482482

@@ -486,7 +486,7 @@ TEST(test_configuration_json, bad_schema_in_globals_reports_error) {
486486
configuration c;
487487
diag_collector errors;
488488
c.load_from_json(&json, &errors);
489-
EXPECT_THAT(errors.errors, ElementsAre(ERROR_TYPE_OFFSETS(
489+
EXPECT_THAT(errors.errors, ElementsAre(DIAG_TYPE_OFFSETS(
490490
&json, diag_config_globals_type_mismatch, //
491491
value, strlen(u8R"({"globals":)"), u8"[")));
492492
EXPECT_FALSE(c.globals().find(u8"myGlobalVariable"_sv))
@@ -501,7 +501,7 @@ TEST(test_configuration_json, bad_schema_in_globals_reports_error) {
501501
c.load_from_json(&json, &errors);
502502
EXPECT_THAT(
503503
errors.errors,
504-
ElementsAre(ERROR_TYPE_OFFSETS(
504+
ElementsAre(DIAG_TYPE_OFFSETS(
505505
&json, diag_config_globals_descriptor_type_mismatch, //
506506
descriptor, strlen(u8R"({"globals":{"testBefore":true,"testBad":)"),
507507
u8R"("string")")));
@@ -522,7 +522,7 @@ TEST(test_configuration_json, bad_schema_in_globals_reports_error) {
522522
c.load_from_json(&json, &errors);
523523
EXPECT_THAT(
524524
errors.errors,
525-
ElementsAre(ERROR_TYPE_OFFSETS(
525+
ElementsAre(DIAG_TYPE_OFFSETS(
526526
&json, diag_config_globals_descriptor_shadowable_type_mismatch, //
527527
value,
528528
strlen(
@@ -550,7 +550,7 @@ TEST(test_configuration_json, bad_schema_in_globals_reports_error) {
550550
c.load_from_json(&json, &errors);
551551
EXPECT_THAT(
552552
errors.errors,
553-
ElementsAre(ERROR_TYPE_OFFSETS(
553+
ElementsAre(DIAG_TYPE_OFFSETS(
554554
&json, diag_config_globals_descriptor_writable_type_mismatch, //
555555
value,
556556
strlen(u8R"({"globals":{"testBefore":true,"testBad":{"writable":)"),
@@ -577,7 +577,7 @@ TEST(test_configuration_json, bad_schema_in_global_groups_reports_error) {
577577
diag_collector errors;
578578
c.load_from_json(&json, &errors);
579579
EXPECT_THAT(errors.errors,
580-
ElementsAre(ERROR_TYPE_OFFSETS(
580+
ElementsAre(DIAG_TYPE_OFFSETS(
581581
&json, diag_config_global_groups_type_mismatch, //
582582
value, strlen(u8R"({"global-groups":)"), u8"{")));
583583
EXPECT_TRUE(c.globals().find(u8"Array"_sv))
@@ -592,7 +592,7 @@ TEST(test_configuration_json, bad_schema_in_global_groups_reports_error) {
592592
c.load_from_json(&json, &errors);
593593
EXPECT_THAT(
594594
errors.errors,
595-
ElementsAre(ERROR_TYPE_OFFSETS(
595+
ElementsAre(DIAG_TYPE_OFFSETS(
596596
&json, diag_config_global_groups_group_type_mismatch, //
597597
group, strlen(u8R"({"global-groups":["browser",)"), u8"false")));
598598

@@ -622,7 +622,7 @@ TEST(test_configuration_json, bad_global_error_excludes_trailing_whitespace) {
622622

623623
EXPECT_THAT(
624624
errors.errors,
625-
ElementsAre(ERROR_TYPE_OFFSETS(
625+
ElementsAre(DIAG_TYPE_OFFSETS(
626626
&json, diag_config_globals_descriptor_type_mismatch, //
627627
descriptor, strlen(u8R"({ "globals": { "a": )"), u8R"("b")")));
628628
}

0 commit comments

Comments
 (0)