Skip to content

reduced padding in simplecpp::Macro #267

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
danmar merged 1 commit into from
Aug 25, 2022
Merged

reduced padding in simplecpp::Macro #267

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
8 changes: 4 additions & 4 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@ namespace simplecpp {

class Macro {
public:
explicit Macro(std::vector<std::string> &f) : nameTokDef(nullptr), variadic(false), valueToken(nullptr), endToken(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(false) {}
explicit Macro(std::vector<std::string> &f) : nameTokDef(nullptr), valueToken(nullptr), endToken(nullptr), files(f), tokenListDefine(f), variadic(false), valueDefinedInCode_(false) {}

Macro(const Token *tok, std::vector<std::string> &f) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(true) {
if (sameline(tok->previous, tok))
Expand Down Expand Up @@ -2063,9 +2063,6 @@ namespace simplecpp {
/** arguments for macro */
std::vector<TokenString> args;

/** is macro variadic? */
bool variadic;

/** first token in replacement string */
const Token *valueToken;

Expand All @@ -2081,6 +2078,9 @@ namespace simplecpp {
/** usage of this macro */
mutable std::list<Location> usageList;

/** is macro variadic? */
bool variadic;

/** was the value of this macro actually defined in the code? */
bool valueDefinedInCode_;
};
Expand Down