Skip to content

testrunner: more usage of actual Preprocessor instead of hand-rolled code / some cleanups #6828

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
chrchr-github merged 3 commits into from
Sep 26, 2024
Merged

testrunner: more usage of actual Preprocessor instead of hand-rolled code / some cleanups #6828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fa5804
TestPreprocessor: removed strange `Preprocessor` inheritance and use …
firewave Sep 24, 2024
8cc3770
PreprocessHelper: use `Preprocessor` instead of hand-rolling the logic
firewave Sep 24, 2024
c556434
TestType: removed `DUI` usage from `integerOverflow()`
firewave Sep 24, 2024
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
16 changes: 15 additions & 1 deletion test/helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,23 @@ std::map<std::string, std::string> PreprocessorHelper::getcode(const Settings& s

void PreprocessorHelper::preprocess(const char code[], std::vector<std::string> &files, Tokenizer& tokenizer, ErrorLogger& errorlogger)
{
preprocess(code, files, tokenizer, errorlogger, simplecpp::DUI());
// TODO: make sure the given Tokenizer has not been used yet

// TODO: get rid of stream
std::istringstream istr(code);
const simplecpp::TokenList tokens1(istr, files, files[0]);

Preprocessor preprocessor(tokenizer.getSettings(), errorlogger);
simplecpp::TokenList tokens2 = preprocessor.preprocess(tokens1, "", files, true);

// Tokenizer..
tokenizer.list.createTokens(std::move(tokens2));

std::list<Directive> directives = preprocessor.createDirectives(tokens1);
tokenizer.setDirectives(std::move(directives));
}

// TODO: get rid of this
Copy link
Copy Markdown
Collaborator Author

@firewave firewave Sep 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not change this function because the only user of this will go away in an upcoming PR.

void PreprocessorHelper::preprocess(const char code[], std::vector<std::string> &files, Tokenizer& tokenizer, ErrorLogger& errorlogger, const simplecpp::DUI& dui)
{
// TODO: make sure the given Tokenizer has not been used yet
Expand Down
Loading