Skip to content

CppCheck: no need to preprocess markup files as they are not actual source code #5896

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
firewave merged 1 commit into from
Jan 19, 2024
Merged

CppCheck: no need to preprocess markup files as they are not actual source code #5896

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions lib/cppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,18 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
CheckUnusedFunctions checkUnusedFunctions(nullptr, nullptr, nullptr);

try {
if (mSettings.library.markupFile(filename)) {
Tokenizer tokenizer(mSettings, this);
if (fileStream)
tokenizer.list.createTokens(*fileStream, filename);
else {
std::ifstream in(filename);
tokenizer.list.createTokens(in, filename);
}
checkUnusedFunctions.getFileInfo(&tokenizer, &mSettings);
return EXIT_SUCCESS;
}

Preprocessor preprocessor(mSettings, this);
std::set<std::string> configurations;

Expand Down Expand Up @@ -662,13 +674,6 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
return mExitCode;
}

if (mSettings.library.markupFile(filename)) {
Tokenizer tokenizer(mSettings, this, &preprocessor);
tokenizer.createTokens(std::move(tokens1));
checkUnusedFunctions.getFileInfo(&tokenizer, &mSettings);
return EXIT_SUCCESS;
}

if (!preprocessor.loadFiles(tokens1, files))
return mExitCode;

Expand Down