Skip to content

Commit eb5db3c

Browse files
stragerstrager
committed
refactor: rename error_collector -> diag_collector
1 parent d3dd5d2 commit eb5db3c

25 files changed

+343
-344
lines changed

‎test/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ include(QuickLintJSTarget)
77

88
quick_lint_js_add_executable(
99
quick-lint-js-test
10-
error-collector.cpp
10+
diag-collector.cpp
1111
error-matcher.cpp
1212
parse-json.cpp
1313
parse-support.cpp
1414
quick-lint-js/array.h
1515
quick-lint-js/characters.h
16-
quick-lint-js/error-collector.h
16+
quick-lint-js/diag-collector.h
1717
quick-lint-js/error-matcher.h
1818
quick-lint-js/file-matcher.h
1919
quick-lint-js/gtest.h

‎test/error-collector.cpp‎ renamed to ‎test/diag-collector.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// See end of file for extended copyright information.
33

44
#include <ostream>
5-
#include <quick-lint-js/error-collector.h>
5+
#include <quick-lint-js/diag-collector.h>
66
#include <quick-lint-js/token.h>
77
#include <quick-lint-js/unreachable.h>
88

99
namespace quick_lint_js {
10-
void error_collector::report_impl(diag_type type, void *diag) {
10+
void diag_collector::report_impl(diag_type type, void *diag) {
1111
switch (type) {
1212
#define QLJS_DIAG_TYPE(name, code, severity, struct_body, format_call) \
1313
case diag_type::name: \
@@ -19,14 +19,14 @@ void error_collector::report_impl(diag_type type, void *diag) {
1919
}
2020

2121
#define QLJS_DIAG_TYPE(name, code, severity, struct_body, format_call) \
22-
error_collector::error::error(const name &data) \
22+
diag_collector::error::error(const name &data) \
2323
: type_(diag_type::name), variant_##name##_(std::move(data)) {}
2424
QLJS_X_DIAG_TYPES
2525
#undef QLJS_DIAG_TYPE
2626

27-
diag_type error_collector::error::type() const noexcept { return this->type_; }
27+
diag_type diag_collector::error::type() const noexcept { return this->type_; }
2828

29-
const char *error_collector::error::error_code() const noexcept {
29+
const char *diag_collector::error::error_code() const noexcept {
3030
switch (this->type_) {
3131
#define QLJS_DIAG_TYPE(name, code, severity, struct_body, format_call) \
3232
case diag_type::name: \
@@ -37,25 +37,25 @@ const char *error_collector::error::error_code() const noexcept {
3737
QLJS_UNREACHABLE();
3838
}
3939

40-
const void *error_collector::error::data() const noexcept {
40+
const void *diag_collector::error::data() const noexcept {
4141
return &this->variant_diag_unexpected_token_; // Arbitrary member.
4242
}
4343

44-
#define QLJS_DIAG_TYPE(name, code, severity, struct_body, format_call) \
45-
template <> \
46-
bool holds_alternative<name>(const error_collector::error &e) noexcept { \
47-
return e.type_ == diag_type::name; \
48-
} \
49-
\
50-
template <> \
51-
const name &get<name>(const error_collector::error &e) noexcept { \
52-
QLJS_ASSERT(holds_alternative<name>(e)); \
53-
return e.variant_##name##_; \
44+
#define QLJS_DIAG_TYPE(name, code, severity, struct_body, format_call) \
45+
template <> \
46+
bool holds_alternative<name>(const diag_collector::error &e) noexcept { \
47+
return e.type_ == diag_type::name; \
48+
} \
49+
\
50+
template <> \
51+
const name &get<name>(const diag_collector::error &e) noexcept { \
52+
QLJS_ASSERT(holds_alternative<name>(e)); \
53+
return e.variant_##name##_; \
5454
}
5555
QLJS_X_DIAG_TYPES
5656
#undef QLJS_DIAG_TYPE
5757

58-
void PrintTo(const error_collector::error &e, std::ostream *out) {
58+
void PrintTo(const diag_collector::error &e, std::ostream *out) {
5959
*out << e.type_;
6060
}
6161

‎test/error-matcher.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#include <gmock/gmock.h>
66
#include <optional>
77
#include <quick-lint-js/cli-location.h>
8+
#include <quick-lint-js/diag-collector.h>
89
#include <quick-lint-js/diagnostic-types.h>
9-
#include <quick-lint-js/error-collector.h>
1010
#include <quick-lint-js/error-matcher.h>
1111
#include <quick-lint-js/lex.h>
1212
#include <quick-lint-js/location.h>
@@ -193,7 +193,7 @@ error_matcher::error_matcher(padded_string_view input, diag_type type,
193193
: state_{type, input, {field_0, field_1, field_2}} {}
194194

195195
class error_matcher::impl
196-
: public testing::MatcherInterface<const error_collector::error &> {
196+
: public testing::MatcherInterface<const diag_collector::error &> {
197197
public:
198198
explicit impl(state s) : state_(std::move(s)) {}
199199

@@ -211,7 +211,7 @@ class error_matcher::impl
211211
// TODO(strager)
212212
}
213213

214-
bool MatchAndExplain(const error_collector::error &error,
214+
bool MatchAndExplain(const diag_collector::error &error,
215215
testing::MatchResultListener *listener) const override {
216216
bool type_matches = error.type() == this->state_.type;
217217
if (!type_matches) {
@@ -251,8 +251,8 @@ class error_matcher::impl
251251
};
252252

253253
/*implicit*/ error_matcher::operator testing::Matcher<
254-
const error_collector::error &>() const {
255-
return testing::Matcher<const error_collector::error &>(
254+
const diag_collector::error &>() const {
255+
return testing::Matcher<const diag_collector::error &>(
256256
new impl(this->state_));
257257
}
258258
}

‎test/quick-lint-js/error-collector.h‎ renamed to ‎test/quick-lint-js/diag-collector.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <vector>
1515

1616
namespace quick_lint_js {
17-
struct error_collector : public diag_reporter {
17+
struct diag_collector : public diag_reporter {
1818
void report_impl(diag_type type, void *diag) override;
1919

2020
// Like std::variant<(error types)>, but with much faster compilation.
@@ -51,12 +51,12 @@ struct error_collector : public diag_reporter {
5151
};
5252

5353
template <class Error>
54-
const Error &get(const error_collector::error &) noexcept;
54+
const Error &get(const diag_collector::error &) noexcept;
5555

5656
template <class Error>
57-
bool holds_alternative(const error_collector::error &) noexcept;
57+
bool holds_alternative(const diag_collector::error &) noexcept;
5858

59-
void PrintTo(const error_collector::error &, std::ostream *);
59+
void PrintTo(const diag_collector::error &, std::ostream *);
6060

6161
#define QLJS_DIAG_TYPE(name, code, severity, struct_body, format_call) \
6262
void PrintTo(const name &, std::ostream *);

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <optional>
1010
#include <quick-lint-js/char8.h>
1111
#include <quick-lint-js/cli-location.h>
12+
#include <quick-lint-js/diag-collector.h>
1213
#include <quick-lint-js/diagnostic-types.h>
13-
#include <quick-lint-js/error-collector.h>
1414
#include <quick-lint-js/lex.h>
1515
#include <quick-lint-js/location.h>
1616
#include <quick-lint-js/padded-string.h>
@@ -208,8 +208,7 @@ class error_matcher {
208208
error_matcher &operator=(const error_matcher &) = default;
209209
error_matcher &operator=(error_matcher &&) = default;
210210

211-
/*implicit*/ operator testing::Matcher<const error_collector::error &>()
212-
const;
211+
/*implicit*/ operator testing::Matcher<const diag_collector::error &>() const;
213212

214213
private:
215214
class impl;

‎test/quick-lint-js/parse-support.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <quick-lint-js/array.h>
1313
#include <quick-lint-js/char8.h>
1414
#include <quick-lint-js/cli-location.h>
15-
#include <quick-lint-js/error-collector.h>
15+
#include <quick-lint-js/diag-collector.h>
1616
#include <quick-lint-js/null-visitor.h>
1717
#include <quick-lint-js/padded-string.h>
1818
#include <quick-lint-js/parse.h>
@@ -62,7 +62,7 @@ class test_parser {
6262
return ast;
6363
}
6464

65-
const std::vector<error_collector::error>& errors() const noexcept {
65+
const std::vector<diag_collector::error>& errors() const noexcept {
6666
return this->errors_.errors;
6767
}
6868

@@ -83,7 +83,7 @@ class test_parser {
8383
cli_locator locator;
8484

8585
private:
86-
error_collector errors_;
86+
diag_collector errors_;
8787
quick_lint_js::parser parser_;
8888
std::vector<expression*> expressions_needing_cleanup_;
8989
};

‎test/quick-lint-js/spy-visitor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <iosfwd>
88
#include <optional>
99
#include <quick-lint-js/char8.h>
10-
#include <quick-lint-js/error-collector.h>
10+
#include <quick-lint-js/diag-collector.h>
1111
#include <quick-lint-js/gtest.h>
1212
#include <quick-lint-js/language.h>
1313
#include <quick-lint-js/lex.h>
@@ -16,7 +16,7 @@
1616
#include <vector>
1717

1818
namespace quick_lint_js {
19-
struct spy_visitor : public error_collector {
19+
struct spy_visitor : public diag_collector {
2020
std::vector<std::string_view> visits;
2121

2222
void visit_end_of_module() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <gmock/gmock.h>
55
#include <gtest/gtest.h>
66
#include <quick-lint-js/buffering-diag-reporter.h>
7+
#include <quick-lint-js/diag-collector.h>
78
#include <quick-lint-js/diagnostic-types.h>
8-
#include <quick-lint-js/error-collector.h>
99
#include <quick-lint-js/error-matcher.h>
1010
#include <quick-lint-js/lex.h>
1111
#include <quick-lint-js/linked-bump-allocator.h>
@@ -32,7 +32,7 @@ TEST(test_buffering_diag_reporter, buffers_all_visits) {
3232
.token = u8'(',
3333
});
3434

35-
error_collector collector;
35+
diag_collector collector;
3636
diag_reporter.move_into(&collector);
3737
EXPECT_THAT(
3838
collector.errors,

‎test/test-configuration.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <gtest/gtest.h>
55
#include <quick-lint-js/char8.h>
66
#include <quick-lint-js/configuration.h>
7+
#include <quick-lint-js/diag-collector.h>
78
#include <quick-lint-js/diagnostic-types.h>
8-
#include <quick-lint-js/error-collector.h>
99
#include <quick-lint-js/error-matcher.h>
1010
#include <quick-lint-js/language.h>
1111
#include <quick-lint-js/lint.h>
@@ -471,7 +471,7 @@ TEST(test_configuration_json, invalid_json_reports_error) {
471471
configuration c;
472472

473473
padded_string json(json_string);
474-
error_collector errors;
474+
diag_collector errors;
475475
c.load_from_json(&json, &errors);
476476

477477
// TODO(strager): Check diag_config_json_syntax_error::where.
@@ -484,7 +484,7 @@ TEST(test_configuration_json, bad_schema_in_globals_reports_error) {
484484
{
485485
padded_string json(u8R"({"globals":["myGlobalVariable"]})"sv);
486486
configuration c;
487-
error_collector errors;
487+
diag_collector errors;
488488
c.load_from_json(&json, &errors);
489489
EXPECT_THAT(errors.errors, ElementsAre(ERROR_TYPE_OFFSETS(
490490
&json, diag_config_globals_type_mismatch, //
@@ -497,7 +497,7 @@ TEST(test_configuration_json, bad_schema_in_globals_reports_error) {
497497
padded_string json(
498498
u8R"({"globals":{"testBefore":true,"testBad":"string","testAfter":true}})"sv);
499499
configuration c;
500-
error_collector errors;
500+
diag_collector errors;
501501
c.load_from_json(&json, &errors);
502502
EXPECT_THAT(
503503
errors.errors,
@@ -518,7 +518,7 @@ TEST(test_configuration_json, bad_schema_in_globals_reports_error) {
518518
padded_string json(
519519
u8R"({"globals":{"testBefore":true,"testBad":{"writable":false,"shadowable":"string"},"testAfter":true}})"sv);
520520
configuration c;
521-
error_collector errors;
521+
diag_collector errors;
522522
c.load_from_json(&json, &errors);
523523
EXPECT_THAT(
524524
errors.errors,
@@ -546,7 +546,7 @@ TEST(test_configuration_json, bad_schema_in_globals_reports_error) {
546546
padded_string json(
547547
u8R"({"globals":{"testBefore":true,"testBad":{"writable":"string","shadowable":false},"testAfter":true}})"sv);
548548
configuration c;
549-
error_collector errors;
549+
diag_collector errors;
550550
c.load_from_json(&json, &errors);
551551
EXPECT_THAT(
552552
errors.errors,
@@ -574,7 +574,7 @@ TEST(test_configuration_json, bad_schema_in_global_groups_reports_error) {
574574
{
575575
padded_string json(u8R"({"global-groups":{"browser":true}})"sv);
576576
configuration c;
577-
error_collector errors;
577+
diag_collector errors;
578578
c.load_from_json(&json, &errors);
579579
EXPECT_THAT(errors.errors,
580580
ElementsAre(ERROR_TYPE_OFFSETS(
@@ -588,7 +588,7 @@ TEST(test_configuration_json, bad_schema_in_global_groups_reports_error) {
588588
padded_string json(
589589
u8R"({"global-groups":["browser",false,"ecmascript"]})"sv);
590590
configuration c;
591-
error_collector errors;
591+
diag_collector errors;
592592
c.load_from_json(&json, &errors);
593593
EXPECT_THAT(
594594
errors.errors,
@@ -617,7 +617,7 @@ TEST(test_configuration_json, bad_global_error_excludes_trailing_whitespace) {
617617
// and U+0020.
618618
padded_string json(u8"{ \"globals\": { \"a\": \"b\" \n\t\r }}"sv);
619619
configuration c;
620-
error_collector errors;
620+
diag_collector errors;
621621
c.load_from_json(&json, &errors);
622622

623623
EXPECT_THAT(
@@ -628,7 +628,7 @@ TEST(test_configuration_json, bad_global_error_excludes_trailing_whitespace) {
628628
}
629629

630630
void load_from_json(configuration& config, padded_string_view json) {
631-
error_collector errors;
631+
diag_collector errors;
632632
config.load_from_json(json, &errors);
633633
EXPECT_THAT(errors.errors, ::testing::IsEmpty());
634634
}

0 commit comments

Comments
 (0)