Skip to content

Commit df584c4

Browse files
committed
TokenList: added missing settings checks
1 parent b711f88 commit df584c4

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

lib/tokenlist.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,7 @@ void TokenList::simplifyStdType()
19971997
continue;
19981998
}
19991999

2000-
if (Token::Match(tok, "char|short|int|long|unsigned|signed|double|float") || (isC() && (mSettings->standards.c >= Standards::C99) && Token::Match(tok, "complex|_Complex"))) {
2000+
if (Token::Match(tok, "char|short|int|long|unsigned|signed|double|float") || (isC() && (!mSettings || (mSettings->standards.c >= Standards::C99)) && Token::Match(tok, "complex|_Complex"))) {
20012001
bool isFloat= false;
20022002
bool isSigned = false;
20032003
bool isUnsigned = false;
@@ -2020,7 +2020,7 @@ void TokenList::simplifyStdType()
20202020
else if (Token::Match(tok2, "float|double")) {
20212021
isFloat = true;
20222022
typeSpec = tok2;
2023-
} else if (isC() && (mSettings->standards.c >= Standards::C99) && Token::Match(tok2, "complex|_Complex"))
2023+
} else if (isC() && (!mSettings || (mSettings->standards.c >= Standards::C99)) && Token::Match(tok2, "complex|_Complex"))
20242024
isComplex = !isFloat || tok2->str() == "_Complex" || Token::Match(tok2->next(), "*|&|%name%"); // Ensure that "complex" is not the variables name
20252025
else if (Token::Match(tok2, "char|int")) {
20262026
if (!typeSpec)

0 commit comments

Comments
 (0)