Cache and reuse value

Dmitry-Me · Dmitry-Me · commit f96484b60972 · 2015-12-08T10:36:03.000+03:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1734,9 +1734,10 @@ bool Tokenizer::tokenize(std::istream &code,
             for (std::size_t i = 0; i < _symbolDatabase->getVariableListSize(); i++) {
                 const Variable* var = _symbolDatabase->getVariableFromVarId(i);
                 if (var && var->isRValueReference()) {
-                    const_cast<Token*>(var->typeEndToken())->str("&");
-                    const_cast<Token*>(var->typeEndToken())->insertToken("&");
-                    const_cast<Token*>(var->typeEndToken()->next())->scope(var->typeEndToken()->scope());
+                    Token* endTok = const_cast<Token*>(var->typeEndToken());
+                    endTok->str("&");
+                    endTok->insertToken("&");
+                    endTok->next()->scope(endTok->scope());
                 }
             }
 
@@ -2100,10 +2101,11 @@ void Tokenizer::simplifyArrayAccessSyntax()
     // 0[a] -> a[0]
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (tok->isNumber() && Token::Match(tok, "%num% [ %name% ]")) {
-            std::string temp = tok->str();
-            tok->str(tok->strAt(2));
-            tok->varId(tok->tokAt(2)->varId());
-            tok->tokAt(2)->str(temp);
+            const std::string number(tok->str());
+            Token* indexTok = tok->tokAt(2);
+            tok->str(indexTok->str());
+            tok->varId(indexTok->varId());
+            indexTok->str(number);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1734,9 +1734,10 @@ bool Tokenizer::tokenize(std::istream &code,`
`1734`	`1734`	`for (std::size_t i = 0; i < _symbolDatabase->getVariableListSize(); i++) {`
`1735`	`1735`	`const Variable* var = _symbolDatabase->getVariableFromVarId(i);`
`1736`	`1736`	`if (var && var->isRValueReference()) {`
`1737`		`- const_cast<Token*>(var->typeEndToken())->str("&");`
`1738`		`- const_cast<Token*>(var->typeEndToken())->insertToken("&");`
`1739`		`- const_cast<Token*>(var->typeEndToken()->next())->scope(var->typeEndToken()->scope());`
	`1737`	`+ Token* endTok = const_cast<Token*>(var->typeEndToken());`
	`1738`	`+ endTok->str("&");`
	`1739`	`+ endTok->insertToken("&");`
	`1740`	`+ endTok->next()->scope(endTok->scope());`
`1740`	`1741`	`}`
`1741`	`1742`	`}`
`1742`	`1743`
`@@ -2100,10 +2101,11 @@ void Tokenizer::simplifyArrayAccessSyntax()`
`2100`	`2101`	`// 0[a] -> a[0]`
`2101`	`2102`	`for (Token *tok = list.front(); tok; tok = tok->next()) {`
`2102`	`2103`	`if (tok->isNumber() && Token::Match(tok, "%num% [ %name% ]")) {`
`2103`		`- std::string temp = tok->str();`
`2104`		`- tok->str(tok->strAt(2));`
`2105`		`- tok->varId(tok->tokAt(2)->varId());`
`2106`		`- tok->tokAt(2)->str(temp);`
	`2104`	`+ const std::string number(tok->str());`
	`2105`	`+ Token* indexTok = tok->tokAt(2);`
	`2106`	`+ tok->str(indexTok->str());`
	`2107`	`+ tok->varId(indexTok->varId());`
	`2108`	`+ indexTok->str(number);`
`2107`	`2109`	`}`
`2108`	`2110`	`}`
`2109`	`2111`	`}`