Skip to content

Clean up validation #3082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 4 commits into from
Sep 13, 2022
Merged

Clean up validation #3082

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f071556
Clean up validation
AZero13 Sep 7, 2022
4475791
Use an empty comment to force line wrapping.
StephanTLavavej Sep 7, 2022
f7ca86c
read_next_block() isn't conceptually const.
StephanTLavavej Sep 12, 2022
cd3901a
Remove novel clang-format override
CaseyCarter Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions tools/validate/validate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ constexpr size_t max_line_length = 120;

class BinaryFile {
public:
explicit BinaryFile(const filesystem::path& filepath) {
m_file = _wfopen(filepath.c_str(), L"rb");

explicit BinaryFile(const filesystem::path& filepath) : m_file(_wfopen(filepath.c_str(), L"rb")) {
if (!m_file) {
fwprintf(stderr, L"Validation failed: %ls couldn't be opened.\n", filepath.c_str());
}
Expand Down Expand Up @@ -191,9 +189,9 @@ void scan_file(
L".py"sv,
L".yml"sv,
};
static_assert(is_sorted(checked_extensions.begin(), checked_extensions.end()));
static_assert(ranges::is_sorted(checked_extensions));

if (binary_search(checked_extensions.begin(), checked_extensions.end(), filepath.extension().wstring())) {
if (ranges::binary_search(checked_extensions, filepath.extension().wstring())) {
validation_failure(any_errors, filepath, L"file contains %zu lines with more than %zu columns.\n",
overlength_lines, max_line_length);
}
Expand Down Expand Up @@ -229,10 +227,10 @@ int main() {
L".gitmodules"sv,
};

static_assert(is_sorted(skipped_directories.begin(), skipped_directories.end()));
static_assert(is_sorted(skipped_extensions.begin(), skipped_extensions.end()));
static_assert(is_sorted(bad_extensions.begin(), bad_extensions.end()));
static_assert(is_sorted(tabby_filenames.begin(), tabby_filenames.end()));
static_assert(ranges::is_sorted(skipped_directories));
static_assert(ranges::is_sorted(skipped_extensions));
static_assert(ranges::is_sorted(bad_extensions));
static_assert(ranges::is_sorted(tabby_filenames));

vector<unsigned char> buffer; // reused for performance
bool any_errors = false;
Expand All @@ -244,7 +242,7 @@ int main() {

if (!rdi->is_regular_file()) {
if (rdi->is_directory()) {
if (binary_search(skipped_directories.begin(), skipped_directories.end(), filename)) {
if (ranges::binary_search(skipped_directories, filename)) {
rdi.disable_recursion_pending();
}
}
Expand All @@ -266,18 +264,17 @@ int main() {

const wstring extension = filepath.extension().wstring();

if (binary_search(skipped_extensions.begin(), skipped_extensions.end(), extension)) {
if (ranges::binary_search(skipped_extensions, extension)) {
continue;
}

if (binary_search(bad_extensions.begin(), bad_extensions.end(), extension)) {
if (ranges::binary_search(bad_extensions, extension)) {
validation_failure(any_errors, filepath, L"file should not be checked in.");
continue;
}

const TabPolicy tab_policy = binary_search(tabby_filenames.begin(), tabby_filenames.end(), filename)
? TabPolicy::Allowed
: TabPolicy::Forbidden;
const TabPolicy tab_policy =
ranges::binary_search(tabby_filenames, filename) ? TabPolicy::Allowed : TabPolicy::Forbidden;

scan_file(any_errors, filepath, tab_policy, buffer);
}
Expand Down