Skip to content

TokenList: removed determineCppC() / removed language fallbacks / cleaned up asserts #7515

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
firewave merged 1 commit into from
May 9, 2025
Merged

TokenList: removed determineCppC() / removed language fallbacks / cleaned up asserts #7515

Show file tree
Hide file tree
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
46 changes: 2 additions & 44 deletions lib/tokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "token.h"

#include <algorithm>
#include <cassert>
#include <cctype>
#include <cstdint>
#include <exception>
Expand All @@ -45,15 +46,6 @@

#include <simplecpp.h>

//#define N_ASSERT_LANG

#ifndef N_ASSERT_LANG
#include <cassert>
#define ASSERT_LANG(x) assert(x)
#else
#define ASSERT_LANG(x)
#endif

// How many compileExpression recursions are allowed?
// For practical code this could be endless. But in some special torture test
// there needs to be a limit.
Expand Down Expand Up @@ -97,25 +89,9 @@ void TokenList::deallocateTokens()
mFiles.clear();
}

void TokenList::determineCppC()
{
// only try to determine if it wasn't enforced
if (mLang == Standards::Language::None) {
ASSERT_LANG(!getSourceFilePath().empty());
mLang = Path::identify(getSourceFilePath(), mSettings.cppHeaderProbe);
// TODO: cannot enable assert as this might occur for unknown extensions
//ASSERT_LANG(mLang != Standards::Language::None);
if (mLang == Standards::Language::None) {
// TODO: should default to C instead like we do for headers
// default to C++
mLang = Standards::Language::CPP;
}
}
}

int TokenList::appendFileIfNew(std::string fileName)
{
ASSERT_LANG(!fileName.empty());
assert(!fileName.empty());

// Has this file been tokenized already?
auto it = std::find_if(mFiles.cbegin(), mFiles.cend(), [&](const std::string& f) {
Expand All @@ -127,10 +103,6 @@ int TokenList::appendFileIfNew(std::string fileName)
// The "mFiles" vector remembers what files have been tokenized..
mFiles.push_back(std::move(fileName));

// Update mIsC and mIsCpp properties
if (mFiles.size() == 1) { // Update only useful if first file added to _files
determineCppC();
}
return mFiles.size() - 1;
}

Expand Down Expand Up @@ -378,8 +350,6 @@ void TokenList::createTokens(simplecpp::TokenList&& tokenList)
else
mFiles.clear();

determineCppC();

for (const simplecpp::Token *tok = tokenList.cfront(); tok;) {

// TODO: move from TokenList
Expand Down Expand Up @@ -2247,23 +2217,11 @@ bool TokenList::isKeyword(const std::string &str) const

bool TokenList::isC() const
{
ASSERT_LANG(mLang != Standards::Language::None);

// TODO: remove the fallback
if (mLang == Standards::Language::None)
return false; // treat as C++ by default

return mLang == Standards::Language::C;
}

bool TokenList::isCPP() const
{
ASSERT_LANG(mLang != Standards::Language::None);

// TODO: remove the fallback
if (mLang == Standards::Language::None)
return true; // treat as C++ by default

return mLang == Standards::Language::CPP;
}

Expand Down
2 changes: 0 additions & 2 deletions lib/tokenlist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,6 @@ class CPPCHECKLIB TokenList {
static const Token * isFunctionHead(const Token *tok, const std::string &endsWith);

private:
void determineCppC();

bool createTokensInternal(std::istream &code, const std::string& file0);

/** Token list */
Expand Down
Loading