Skip to content

Commit c5e8871

Browse files
committed
refactor: rename structs: error_* -> diag_*
1 parent 8550327 commit c5e8871

34 files changed

+1707
-1782
lines changed

src/configuration.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void configuration::load_from_json(padded_string_view json,
113113
::simdjson::ondemand::value v;
114114
if (globals.get(v) == ::simdjson::SUCCESS &&
115115
v.type().error() == ::simdjson::SUCCESS) {
116-
reporter->report(error_config_globals_type_mismatch{
116+
reporter->report(diag_config_globals_type_mismatch{
117117
.value = span_of_json_value(v),
118118
});
119119
} else {
@@ -195,7 +195,7 @@ bool configuration::load_global_groups_from_json(
195195
if (global_group_value.type().error() != ::simdjson::SUCCESS) {
196196
return false;
197197
}
198-
reporter->report(error_config_global_groups_group_type_mismatch{
198+
reporter->report(diag_config_global_groups_group_type_mismatch{
199199
.group = span_of_json_value(global_group_value),
200200
});
201201
break;
@@ -211,7 +211,7 @@ bool configuration::load_global_groups_from_json(
211211
case ::simdjson::ondemand::json_type::number:
212212
case ::simdjson::ondemand::json_type::object:
213213
case ::simdjson::ondemand::json_type::string:
214-
reporter->report(error_config_global_groups_type_mismatch{
214+
reporter->report(diag_config_global_groups_type_mismatch{
215215
.value = span_of_json_value(global_groups_value),
216216
});
217217
break;
@@ -265,13 +265,13 @@ bool configuration::load_globals_from_json(
265265
bool is_writable;
266266
bool ok = true;
267267
if (!this->get_bool_or_default<
268-
error_config_globals_descriptor_shadowable_type_mismatch>(
268+
diag_config_globals_descriptor_shadowable_type_mismatch>(
269269
descriptor_object["shadowable"], &is_shadowable, true,
270270
reporter)) {
271271
ok = false;
272272
}
273273
if (!this->get_bool_or_default<
274-
error_config_globals_descriptor_writable_type_mismatch>(
274+
diag_config_globals_descriptor_writable_type_mismatch>(
275275
descriptor_object["writable"], &is_writable, true, reporter)) {
276276
ok = false;
277277
}
@@ -288,7 +288,7 @@ bool configuration::load_globals_from_json(
288288
}
289289

290290
default:
291-
reporter->report(error_config_globals_descriptor_type_mismatch{
291+
reporter->report(diag_config_globals_descriptor_type_mismatch{
292292
.descriptor = span_of_json_value(descriptor),
293293
});
294294
break;
@@ -419,7 +419,7 @@ void configuration::report_json_error(padded_string_view json,
419419
// TODO(strager): Produce better error messages. simdjson provides no location
420420
// information for errors:
421421
// https://github.com/simdjson/simdjson/issues/237
422-
reporter->report(error_config_json_syntax_error{
422+
reporter->report(diag_config_json_syntax_error{
423423
.where = source_code_span(json.data(), json.data()),
424424
});
425425
}

src/diagnostic.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
// message: failure was caused by out of range index 3; allowed range is 0 <=
2424
// index < 2
2525
// message: while evaluating constexpr function
26-
// diagnostic_info_builder<error_adjacent_jsx_without_parent>::add
26+
// diagnostic_info_builder<diag_adjacent_jsx_without_parent>::add
2727
// message: while evaluating constexpr function
28-
// diagnostic_info_for_error<error_adjacent_jsx_without_parent>::get
28+
// diagnostic_info_for_error<diag_adjacent_jsx_without_parent>::get
2929
#define DIAGNOSTIC_CONSTEXPR_IF_POSSIBLE /* */
3030
#else
3131
#define DIAGNOSTIC_CONSTEXPR_IF_POSSIBLE constexpr

0 commit comments

Comments
 (0)