Skip to content

Token: small update_property_info() cleanup #6601

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 3 commits into from
Jul 20, 2024
Merged

Token: small update_property_info() cleanup #6601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04a9fa6
Token: improved early bailout in `update_property_isStandardType()`
firewave Nov 3, 2023
7bd50f2
Token: only call `update_property_*()` functions if they can actually…
firewave Nov 3, 2023
7ae26a0
Token: folded `update_property_char_string_literal()` into `update_pr…
firewave Nov 3, 2023
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
27 changes: 10 additions & 17 deletions lib/token.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,19 @@ static const std::unordered_set<std::string> controlFlowKeywords = {
void Token::update_property_info()
{
setFlag(fIsControlFlowKeyword, controlFlowKeywords.find(mStr) != controlFlowKeywords.end());
isStandardType(false);

if (!mStr.empty()) {
if (mStr == "true" || mStr == "false")
tokType(eBoolean);
else if (isStringLiteral(mStr))
else if (isStringLiteral(mStr)) {
tokType(eString);
else if (isCharLiteral(mStr))
isLong(isPrefixStringCharLiteral(mStr, '"', "L"));
}
else if (isCharLiteral(mStr)) {
tokType(eChar);
isLong(isPrefixStringCharLiteral(mStr, '\'', "L"));
}
else if (std::isalpha((unsigned char)mStr[0]) || mStr[0] == '_' || mStr[0] == '$') { // Name
if (mImpl->mVarId)
tokType(eVariable);
Expand Down Expand Up @@ -157,12 +162,11 @@ void Token::update_property_info()
tokType(eEllipsis);
else
tokType(eOther);

update_property_isStandardType();
} else {
tokType(eNone);
}

update_property_char_string_literal();
update_property_isStandardType();
}

static const std::unordered_set<std::string> stdTypes = { "bool"
Expand All @@ -180,9 +184,7 @@ static const std::unordered_set<std::string> stdTypes = { "bool"

void Token::update_property_isStandardType()
{
isStandardType(false);

if (mStr.size() < 3)
if (mStr.size() < 3 || mStr.size() > 7)
return;

if (stdTypes.find(mStr)!=stdTypes.end()) {
Expand All @@ -191,15 +193,6 @@ void Token::update_property_isStandardType()
}
}

void Token::update_property_char_string_literal()
{
if (mTokType != Token::eString && mTokType != Token::eChar)
return;

isLong(((mTokType == Token::eString) && isPrefixStringCharLiteral(mStr, '"', "L")) ||
((mTokType == Token::eChar) && isPrefixStringCharLiteral(mStr, '\'', "L")));
}

bool Token::isUpperCaseName() const
{
if (!isName())
Expand Down
3 changes: 0 additions & 3 deletions lib/token.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,9 +1418,6 @@ class CPPCHECKLIB Token {
/** Update internal property cache about isStandardType() */
void update_property_isStandardType();

/** Update internal property cache about string and char literals */
void update_property_char_string_literal();

/** Internal helper function to avoid excessive string allocations */
void astStringVerboseRecursive(std::string& ret, const nonneg int indent1 = 0, const nonneg int indent2 = 0) const;

Expand Down