@@ -6904,13 +6904,11 @@ static void valueFlowContainerSize(const TokenList& tokenlist,
69046904 }
69056905 }
69066906 }
6907- }
6908- else if (Token::Match (tok, " ;|{|} %var% =" ) && Token::Match (tok->tokAt (2 )->astOperand2 (), " [({]" ) &&
6907+ } else if (Token::Match (tok, " ;|{|} %var% =" ) && Token::Match (tok->tokAt (2 )->astOperand2 (), " [({]" ) &&
69096908 // init list
69106909 ((tok->tokAt (2 ) == tok->tokAt (2 )->astOperand2 ()->astParent () && !tok->tokAt (2 )->astOperand2 ()->astOperand2 () && tok->tokAt (2 )->astOperand2 ()->str () == " {" ) ||
69116910 // constructor
6912- (!Token::simpleMatch (tok->tokAt (2 )->astOperand2 ()->astOperand1 (), " ." ) && settings.library .detectContainer (tok->tokAt (3 )))))
6913- {
6911+ (!Token::simpleMatch (tok->tokAt (2 )->astOperand2 ()->astOperand1 (), " ." ) && settings.library .detectContainer (tok->tokAt (3 ))))) {
69146912 Token* containerTok = tok->next ();
69156913 if (containerTok->exprId () == 0 )
69166914 continue ;
@@ -6921,10 +6919,8 @@ static void valueFlowContainerSize(const TokenList& tokenlist,
69216919 for (const ValueFlow::Value& value : values)
69226920 valueFlowForward (containerTok->next (), containerTok, value, tokenlist, errorLogger, settings);
69236921 }
6924- }
6925- else if (Token::Match (tok, " . %name% (" ) && tok->astOperand1 () && tok->astOperand1 ()->valueType () &&
6926- tok->astOperand1 ()->valueType ()->container )
6927- {
6922+ } else if (Token::Match (tok, " . %name% (" ) && tok->astOperand1 () && tok->astOperand1 ()->valueType () &&
6923+ tok->astOperand1 ()->valueType ()->container ) {
69286924 const Token* containerTok = tok->astOperand1 ();
69296925 if (containerTok->exprId () == 0 )
69306926 continue ;
@@ -6949,16 +6945,12 @@ static void valueFlowContainerSize(const TokenList& tokenlist,
69496945 valueFlowForward (tok->linkAt (2 ), containerTok, std::move (value), tokenlist, errorLogger, settings);
69506946 }
69516947 // TODO: handle more actions?
6952- }
6953- else if (tok->str () == " +=" && astIsContainer (tok->astOperand1 ()))
6954- {
6948+ } else if (tok->str () == " +=" && astIsContainer (tok->astOperand1 ())) {
69556949 const Token* containerTok = tok->astOperand1 ();
69566950 const Token* valueTok = tok->astOperand2 ();
69576951 const MathLib::bigint size = ValueFlow::valueFlowGetStrLength (valueTok);
69586952 forwardMinimumContainerSize (size, tok, containerTok);
6959- }
6960- else if (tok->str () == " =" && Token::simpleMatch (tok->astOperand2 (), " +" ) && astIsContainerString (tok))
6961- {
6953+ } else if (tok->str () == " =" && Token::simpleMatch (tok->astOperand2 (), " +" ) && astIsContainerString (tok)) {
69626954 const Token* tok2 = tok->astOperand2 ();
69636955 MathLib::bigint size = 0 ;
69646956 while (Token::simpleMatch (tok2, " +" ) && tok2->astOperand2 ()) {
0 commit comments