Skip to content

cleaned and fixed up TokenList/Macro copy/move constructor/assignment #167

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
Feb 13, 2022
Merged

cleaned and fixed up TokenList/Macro copy/move constructor/assignment #167

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
26 changes: 15 additions & 11 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ simplecpp::TokenList::TokenList(const TokenList &other) : frontToken(nullptr), b
}

#if __cplusplus >= 201103L
simplecpp::TokenList::TokenList(TokenList &&other) : frontToken(nullptr), backToken(nullptr), files(other.files)
simplecpp::TokenList::TokenList(TokenList &&other) : TokenList(other)
{
*this = std::move(other);
}
Expand All @@ -242,6 +242,7 @@ simplecpp::TokenList &simplecpp::TokenList::operator=(const TokenList &other)
{
if (this != &other) {
clear();
files = other.files;
for (const Token *tok = other.cfront(); tok; tok = tok->next)
push_back(new Token(*tok));
sizeOfType = other.sizeOfType;
Expand All @@ -254,10 +255,11 @@ simplecpp::TokenList &simplecpp::TokenList::operator=(TokenList &&other)
{
if (this != &other) {
clear();
backToken = other.backToken;
other.backToken = nullptr;
frontToken = other.frontToken;
other.frontToken = nullptr;
backToken = other.backToken;
other.backToken = nullptr;
files = other.files;
sizeOfType = std::move(other.sizeOfType);
}
return *this;
Expand Down Expand Up @@ -1261,20 +1263,22 @@ namespace simplecpp {
throw std::runtime_error("bad macro syntax. macroname=" + name + " value=" + value);
}

Macro(const Macro &macro) : nameTokDef(nullptr), files(macro.files), tokenListDefine(macro.files), valueDefinedInCode_(macro.valueDefinedInCode_) {
*this = macro;
Macro(const Macro &other) : nameTokDef(nullptr), files(other.files), tokenListDefine(other.files), valueDefinedInCode_(other.valueDefinedInCode_) {
*this = other;
}

void operator=(const Macro &macro) {
if (this != &macro) {
valueDefinedInCode_ = macro.valueDefinedInCode_;
if (macro.tokenListDefine.empty())
parseDefine(macro.nameTokDef);
Macro &operator=(const Macro &other) {
if (this != &other) {
files = other.files;
valueDefinedInCode_ = other.valueDefinedInCode_;
if (other.tokenListDefine.empty())
parseDefine(other.nameTokDef);
else {
tokenListDefine = macro.tokenListDefine;
tokenListDefine = other.tokenListDefine;
parseDefine(tokenListDefine.cfront());
}
}
return *this;
}

bool valueDefinedInCode() const {
Expand Down