diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index ee76f7e97..da42f7019 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -3366,7 +3366,7 @@ bool Tokenizer::simplifyTokenList() modified |= simplifyKnownVariables(); modified |= removeRedundantConditions(); modified |= simplifyRedundantParenthesis(); - modified |= simplifyQuestionMark(); + modified |= simplifyConstTernaryOp(); modified |= simplifyCalculations(); } @@ -4416,7 +4416,7 @@ bool Tokenizer::simplifyConditions() return ret; } -bool Tokenizer::simplifyQuestionMark() +bool Tokenizer::simplifyConstTernaryOp() { bool ret = false; for (Token *tok = list.front(); tok; tok = tok->next()) { diff --git a/lib/tokenize.h b/lib/tokenize.h index 186eb95b9..002ddcf77 100644 --- a/lib/tokenize.h +++ b/lib/tokenize.h @@ -215,12 +215,12 @@ public: void simplifyStdType(); /** - * Simplify question mark - colon operator + * Simplify easy constant '?:' operation * Example: 0 ? (2/0) : 0 => 0 * @return true if something is modified * false if nothing is done. */ - bool simplifyQuestionMark(); + bool simplifyConstTernaryOp(); /** * Simplify compound assignments