Skip to content

added constness_ptr as pointer wrapper to ensure actual method constness #548

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 2 commits into
base: master
Choose a base branch
from
+51 −32
Draft

added constness_ptr as pointer wrapper to ensure actual method constness #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c1c116
added `constness_ptr` as pointer wrapper to ensure actual method cons…
firewave Sep 24, 2025
faaf570
misc-const-correctness
firewave Sep 27, 2025
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.10)
project (simplecpp LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

include(CheckCXXCompilerFlag)
Expand Down
50 changes: 35 additions & 15 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
# include <sys/stat.h>
#endif

#if __cplusplus >= 201402L
#define SIMPLECPP_PROPAGATE_CONST_GET(t) (t).get()
#else
#define SIMPLECPP_PROPAGATE_CONST_GET(t) (t)
#endif

static bool isHex(const std::string &s)
{
return s.size()>2 && (s.compare(0,2,"0x")==0 || s.compare(0,2,"0X")==0);
Expand Down Expand Up @@ -528,9 +534,9 @@ simplecpp::TokenList &simplecpp::TokenList::operator=(TokenList &&other)
{
if (this != &other) {
clear();
frontToken = other.frontToken;
frontToken = SIMPLECPP_PROPAGATE_CONST_GET(other.frontToken);
other.frontToken = nullptr;
backToken = other.backToken;
backToken = SIMPLECPP_PROPAGATE_CONST_GET(other.backToken);
other.backToken = nullptr;
files = other.files;
sizeOfType = std::move(other.sizeOfType);
Expand All @@ -542,8 +548,9 @@ void simplecpp::TokenList::clear()
{
backToken = nullptr;
while (frontToken) {
// NOLINTNEXTLINE(misc-const-correctness) - FP
Token * const next = frontToken->next;
delete frontToken;
delete SIMPLECPP_PROPAGATE_CONST_GET(frontToken);
frontToken = next;
}
sizeOfType.clear();
Expand All @@ -555,7 +562,7 @@ void simplecpp::TokenList::push_back(Token *tok)
frontToken = tok;
else
backToken->next = tok;
tok->previous = backToken;
tok->previous = SIMPLECPP_PROPAGATE_CONST_GET(backToken);
backToken = tok;
}

Expand Down Expand Up @@ -1378,8 +1385,7 @@ void simplecpp::TokenList::constFoldLogicalOp(Token *tok)
void simplecpp::TokenList::constFoldQuestionOp(Token *&tok1)
{
bool gotoTok1 = false;
// NOLINTNEXTLINE(misc-const-correctness) - technically correct but used to access non-const data
for (Token *tok = tok1; tok && tok->op != ')'; tok = gotoTok1 ? tok1 : tok->next) {
for (Token *tok = tok1; tok && tok->op != ')'; tok = gotoTok1 ? tok1 : SIMPLECPP_PROPAGATE_CONST_GET(tok->next)) {
gotoTok1 = false;
if (tok->str() != "?")
continue;
Expand Down Expand Up @@ -1415,6 +1421,21 @@ void simplecpp::TokenList::removeComments()
}
}

void simplecpp::TokenList::takeTokens(TokenList &other)
{
if (!other.frontToken)
return;
if (!frontToken) {
frontToken = SIMPLECPP_PROPAGATE_CONST_GET(other.frontToken);
} else {
backToken->next = SIMPLECPP_PROPAGATE_CONST_GET(other.frontToken);
other.frontToken->previous = SIMPLECPP_PROPAGATE_CONST_GET(backToken);
}
backToken = SIMPLECPP_PROPAGATE_CONST_GET(other.backToken);
other.frontToken = nullptr;
other.backToken = nullptr;
}

std::string simplecpp::TokenList::readUntil(Stream &stream, const Location &location, const char start, const char end, OutputList *outputList)
{
std::string ret;
Expand Down Expand Up @@ -1793,7 +1814,7 @@ namespace simplecpp {
valueToken = nullptr;
return false;
}
valueToken = argtok ? argtok->next : nullptr;
valueToken = argtok ? SIMPLECPP_PROPAGATE_CONST_GET(argtok->next) : nullptr;
} else {
args.clear();
valueToken = nameTokDef->next;
Expand Down Expand Up @@ -1832,7 +1853,7 @@ namespace simplecpp {
tok = tok->next;
}
if (par != 0) {
const Token *const lastTok = expandValue.back() ? expandValue.back() : valueToken->next;
const Token *const lastTok = expandValue.back() ? expandValue.back() : SIMPLECPP_PROPAGATE_CONST_GET(valueToken->next);
throw Error(lastTok->location, "In definition of '" + nameTokDef->str() + "': Missing closing parenthesis for __VA_OPT__");
}
} else {
Expand Down Expand Up @@ -2001,7 +2022,6 @@ namespace simplecpp {
}
}

// NOLINTNEXTLINE(misc-const-correctness) - technically correct but used to access non-const data
Token * const output_end_1 = output.back();

const Token *valueToken2;
Expand Down Expand Up @@ -2088,7 +2108,7 @@ namespace simplecpp {
}

if (!functionLike()) {
for (Token *tok = output_end_1 ? output_end_1->next : output.front(); tok; tok = tok->next) {
for (Token *tok = output_end_1 ? SIMPLECPP_PROPAGATE_CONST_GET(output_end_1->next) : output.front(); tok; tok = tok->next) {
tok->macro = nameTokInst->str();
}
}
Expand Down Expand Up @@ -2190,8 +2210,8 @@ namespace simplecpp {

if (tok->str() == DEFINED) {
const Token * const tok2 = tok->next;
const Token * const tok3 = tok2 ? tok2->next : nullptr;
const Token * const tok4 = tok3 ? tok3->next : nullptr;
const Token * const tok3 = tok2 ? SIMPLECPP_PROPAGATE_CONST_GET(tok2->next) : nullptr;
const Token * const tok4 = tok3 ? SIMPLECPP_PROPAGATE_CONST_GET(tok3->next) : nullptr;
const Token *defToken = nullptr;
const Token *lastToken = nullptr;
if (sameline(tok, tok4) && tok2->op == '(' && tok3->name && tok4->op == ')') {
Expand Down Expand Up @@ -3243,7 +3263,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
filelist.emplace_back(filedata->tokens.front());
}

for (const Token *rawtok = rawtokens.cfront(); rawtok || !filelist.empty(); rawtok = rawtok ? rawtok->next : nullptr) {
for (const Token *rawtok = rawtokens.cfront(); rawtok || !filelist.empty(); rawtok = rawtok ? SIMPLECPP_PROPAGATE_CONST_GET(rawtok->next) : nullptr) {
if (rawtok == nullptr) {
rawtok = filelist.back();
filelist.pop_back();
Expand Down Expand Up @@ -3678,7 +3698,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
expr.push_back(new Token("0", tok->location));
}
if (par)
tok = tok ? tok->next : nullptr;
tok = tok ? SIMPLECPP_PROPAGATE_CONST_GET(tok->next) : nullptr;
if (!tok || !sameline(rawtok,tok) || (par && tok->op != ')')) {
if (outputList) {
Output out{
Expand Down Expand Up @@ -3721,7 +3741,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
}
}
if (par)
tok = tok ? tok->next : nullptr;
tok = tok ? SIMPLECPP_PROPAGATE_CONST_GET(tok->next) : nullptr;
if (!tok || !sameline(rawtok,tok) || (par && tok->op != ')') || (!closingAngularBracket)) {
if (outputList) {
Output out{
Expand Down
31 changes: 15 additions & 16 deletions simplecpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
#include <span>
#endif

#if __cplusplus >= 201402L
#include <experimental/propagate_const>

#define SIMPLECPP_PROPAGATE_CONST(t) std::experimental::propagate_const<t>
#else
#define SIMPLECPP_PROPAGATE_CONST(t) t
#endif

#ifdef _WIN32
# ifdef SIMPLECPP_EXPORT
# define SIMPLECPP_LIB __declspec(dllexport)
Expand Down Expand Up @@ -186,8 +194,8 @@ namespace simplecpp {
bool number;
bool whitespaceahead;
Location location;
Token *previous{};
Token *next{};
SIMPLECPP_PROPAGATE_CONST(Token*) previous;
SIMPLECPP_PROPAGATE_CONST(Token*) next;
mutable const Token *nextcond{};

const Token *previousSkipComments() const {
Expand Down Expand Up @@ -356,18 +364,7 @@ namespace simplecpp {
delete tok;
}

void takeTokens(TokenList &other) {
if (!other.frontToken)
return;
if (!frontToken) {
frontToken = other.frontToken;
} else {
backToken->next = other.frontToken;
other.frontToken->previous = backToken;
}
backToken = other.backToken;
other.frontToken = other.backToken = nullptr;
}
void takeTokens(TokenList &other);

/** sizeof(T) */
std::map<std::string, std::size_t> sizeOfType;
Expand Down Expand Up @@ -406,8 +403,8 @@ namespace simplecpp {

unsigned int fileIndex(const std::string &filename);

Token *frontToken;
Token *backToken;
SIMPLECPP_PROPAGATE_CONST(Token*) frontToken;
SIMPLECPP_PROPAGATE_CONST(Token*) backToken;
std::vector<std::string> &files;
};

Expand Down Expand Up @@ -634,6 +631,8 @@ namespace simplecpp {
# pragma warning(pop)
#endif

#undef SIMPLECPP_PROPAGATE_CONST

#undef SIMPLECPP_LIB

#endif
Loading