Skip to content

Commit 9da447e

Browse files
stragerstrager
committed
refactor: rename error_tape to reported_diag_statistics
I think the name reported_diag_statistics better explains what the class does than error_tape.
1 parent 4c1fc9a commit 9da447e

File tree

3 files changed

+32
-28
lines changed

3 files changed

+32
-28
lines changed

‎src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ quick_lint_js_add_library(
115115
quick-lint-js/emacs-lisp-diag-reporter.h
116116
quick-lint-js/emacs-location.h
117117
quick-lint-js/error-list.h
118-
quick-lint-js/error-tape.h
119118
quick-lint-js/event-loop.h
120119
quick-lint-js/expression.h
121120
quick-lint-js/feature.h
@@ -157,6 +156,7 @@ quick_lint_js_add_library(
157156
quick-lint-js/parse.h
158157
quick-lint-js/pipe-writer.h
159158
quick-lint-js/pipe.h
159+
quick-lint-js/reported-diag-statistics.h
160160
quick-lint-js/result.h
161161
quick-lint-js/simd.h
162162
quick-lint-js/simdjson.h

‎src/main.cpp‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <quick-lint-js/emacs-lisp-diag-reporter.h>
1515
#include <quick-lint-js/emacs-location.h>
1616
#include <quick-lint-js/error-list.h>
17-
#include <quick-lint-js/error-tape.h>
1817
#include <quick-lint-js/event-loop.h>
1918
#include <quick-lint-js/file.h>
2019
#include <quick-lint-js/language.h>
@@ -28,6 +27,7 @@
2827
#include <quick-lint-js/parse-visitor.h>
2928
#include <quick-lint-js/parse.h>
3029
#include <quick-lint-js/pipe-writer.h>
30+
#include <quick-lint-js/reported-diag-statistics.h>
3131
#include <quick-lint-js/text-diag-reporter.h>
3232
#include <quick-lint-js/translation.h>
3333
#include <quick-lint-js/unreachable.h>
@@ -78,19 +78,21 @@ class any_diag_reporter {
7878
switch (format) {
7979
case output_format::default_format:
8080
case output_format::gnu_like:
81-
return any_diag_reporter(error_tape<text_diag_reporter>(
81+
return any_diag_reporter(reported_diag_statistics<text_diag_reporter>(
8282
text_diag_reporter(
8383
file_output_stream::get_stderr(),
8484
/*escape_errors=*/get_escape_errors(escape_errors)),
8585
exit_fail_on));
8686
case output_format::vim_qflist_json:
87-
return any_diag_reporter(error_tape<vim_qflist_json_diag_reporter>(
88-
vim_qflist_json_diag_reporter(file_output_stream::get_stdout()),
89-
exit_fail_on));
87+
return any_diag_reporter(
88+
reported_diag_statistics<vim_qflist_json_diag_reporter>(
89+
vim_qflist_json_diag_reporter(file_output_stream::get_stdout()),
90+
exit_fail_on));
9091
case output_format::emacs_lisp:
91-
return any_diag_reporter(error_tape<emacs_lisp_diag_reporter>(
92-
emacs_lisp_diag_reporter(file_output_stream::get_stdout()),
93-
exit_fail_on));
92+
return any_diag_reporter(
93+
reported_diag_statistics<emacs_lisp_diag_reporter>(
94+
emacs_lisp_diag_reporter(file_output_stream::get_stdout()),
95+
exit_fail_on));
9496
}
9597
QLJS_UNREACHABLE();
9698
}
@@ -99,13 +101,13 @@ class any_diag_reporter {
99101
visit(
100102
[&](auto &r) {
101103
using reporter_type = std::decay_t<decltype(r)>;
102-
if constexpr (std::is_base_of_v<
103-
error_tape<vim_qflist_json_diag_reporter>,
104-
reporter_type>) {
104+
if constexpr (std::is_base_of_v<reported_diag_statistics<
105+
vim_qflist_json_diag_reporter>,
106+
reporter_type>) {
105107
r.get_reporter()->set_source(input, file.path, file.vim_bufnr);
106-
} else if constexpr (std::is_base_of_v<
107-
error_tape<emacs_lisp_diag_reporter>,
108-
reporter_type>) {
108+
} else if constexpr (std::is_base_of_v<reported_diag_statistics<
109+
emacs_lisp_diag_reporter>,
110+
reporter_type>) {
109111
r.get_reporter()->set_source(input);
110112
} else {
111113
r.get_reporter()->set_source(input, file.path);
@@ -126,23 +128,24 @@ class any_diag_reporter {
126128
visit(
127129
[&](auto &r) {
128130
using reporter_type = std::decay_t<decltype(r)>;
129-
if constexpr (std::is_base_of_v<
130-
error_tape<vim_qflist_json_diag_reporter>,
131-
reporter_type>) {
131+
if constexpr (std::is_base_of_v<reported_diag_statistics<
132+
vim_qflist_json_diag_reporter>,
133+
reporter_type>) {
132134
r.get_reporter()->finish();
133-
} else if constexpr (std::is_base_of_v<
134-
error_tape<emacs_lisp_diag_reporter>,
135-
reporter_type>) {
135+
} else if constexpr (std::is_base_of_v<reported_diag_statistics<
136+
emacs_lisp_diag_reporter>,
137+
reporter_type>) {
136138
r.get_reporter()->finish();
137139
}
138140
},
139141
this->tape_);
140142
}
141143

142144
private:
143-
using tape_variant = variant<error_tape<text_diag_reporter>,
144-
error_tape<vim_qflist_json_diag_reporter>,
145-
error_tape<emacs_lisp_diag_reporter>>;
145+
using tape_variant =
146+
variant<reported_diag_statistics<text_diag_reporter>,
147+
reported_diag_statistics<vim_qflist_json_diag_reporter>,
148+
reported_diag_statistics<emacs_lisp_diag_reporter>>;
146149

147150
explicit any_diag_reporter(tape_variant &&tape) : tape_(tape) {}
148151

‎src/quick-lint-js/error-tape.h‎ renamed to ‎src/quick-lint-js/reported-diag-statistics.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (C) 2020 Matthew "strager" Glazar
22
// See end of file for extended copyright information.
33

4-
#ifndef QUICK_LINT_JS_ERROR_TAPE_H
5-
#define QUICK_LINT_JS_ERROR_TAPE_H
4+
#ifndef QUICK_LINT_JS_REPORTED_DIAG_STATISTICS_H
5+
#define QUICK_LINT_JS_REPORTED_DIAG_STATISTICS_H
66

77
#include <quick-lint-js/diag-reporter.h>
88
#include <quick-lint-js/diagnostic-types.h>
@@ -13,9 +13,10 @@
1313

1414
namespace quick_lint_js {
1515
template <typename T>
16-
class error_tape final : public diag_reporter {
16+
class reported_diag_statistics final : public diag_reporter {
1717
public:
18-
explicit error_tape(T reporter, const compiled_error_list *predicate)
18+
explicit reported_diag_statistics(T reporter,
19+
const compiled_error_list *predicate)
1920
: reporter_(reporter), predicate_(predicate) {}
2021

2122
T *get_reporter() { return &(this->reporter_); }

0 commit comments

Comments
 (0)