Skip to content

got rid of some redundant code in simplecpp::preprocess() #622

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

Draft
firewave wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

got rid of some redundant code in simplecpp::preprocess() #622

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
7 changes: 2 additions & 5 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3694,16 +3694,13 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
tok = tmp->previous;
}
try {
const long long result = evaluate(expr, dui, sizeOfType);
conditionIsTrue = (result != 0);
if (ifCond) {
std::string E;
for (const simplecpp::Token *tok = expr.cfront(); tok; tok = tok->next)
E += (E.empty() ? "" : " ") + tok->str();
const long long result = evaluate(expr, dui, sizeOfType);
Copy link
Owner

@danmar danmar Jan 21, 2026

Choose a reason for hiding this comment

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

I am not fully sure about what we want to do here. But since evaluate() modifies the expr, the E will be different. Is it by design to get different string?

Copy link
Collaborator Author

@firewave firewave Jan 21, 2026

Choose a reason for hiding this comment

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

Good catch. Probably need some tests for the ifCond output.

conditionIsTrue = (result != 0);
ifCond->emplace_back(rawtok->location, E, result);
} else {
const long long result = evaluate(expr, dui, sizeOfType);
conditionIsTrue = (result != 0);
}
} catch (const std::runtime_error &e) {
if (outputList) {
Expand Down