From 8b088a472f637fa3db19bc62c2624a9324f30d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Thu, 26 May 2016 12:04:18 +0200 Subject: [PATCH] SymbolDatabase: Refactoring --- lib/symboldatabase.cpp | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp index a0c450e5c..3aae6e933 100644 --- a/lib/symboldatabase.cpp +++ b/lib/symboldatabase.cpp @@ -1287,15 +1287,13 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti // rhs of [ const Token *rhs = dimension.start->previous()->astOperand2(); - if (rhs) { - // constant folding of expression: - ValueFlow::valueFlowConstantFoldAST(rhs); + // constant folding of expression: + ValueFlow::valueFlowConstantFoldAST(rhs); - // get constant folded value: - if (rhs->values.size() == 1U && rhs->values.front().isKnown()) { - dimension.num = rhs->values.front().intvalue; - dimension.known = true; - } + // get constant folded value: + if (rhs && rhs->values.size() == 1U && rhs->values.front().isKnown()) { + dimension.num = rhs->values.front().intvalue; + dimension.known = true; } } } @@ -3284,16 +3282,14 @@ const Token * Scope::addEnum(const Token * tok, bool isCpp) // rhs of operator: const Token *rhs = enumerator.start->previous()->astOperand2(); - if (rhs) { - // constant folding of expression: - ValueFlow::valueFlowConstantFoldAST(rhs); + // constant folding of expression: + ValueFlow::valueFlowConstantFoldAST(rhs); - // get constant folded value: - if (rhs->values.size() == 1U && rhs->values.front().isKnown()) { - enumerator.value = rhs->values.front().intvalue; - enumerator.value_known = true; - value = enumerator.value + 1; - } + // get constant folded value: + if (rhs && rhs->values.size() == 1U && rhs->values.front().isKnown()) { + enumerator.value = rhs->values.front().intvalue; + enumerator.value_known = true; + value = enumerator.value + 1; } } }