Cache and reuse value

Dmitry-Me · Dmitry-Me · commit 5885988b1f5f · 2017-09-04T23:33:52.000+03:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -1245,11 +1245,12 @@ void CheckClass::operatorEq()
                 }
                 if (!returnSelfRef) {
                     // make sure we really have a copy assignment operator
-                    if (Token::Match(func->tokenDef->tokAt(2), "const| %name% &")) {
-                        if (func->tokenDef->strAt(2) == "const" &&
-                            func->tokenDef->strAt(3) == scope->className)
+                    const Token *paramTok = func->tokenDef->tokAt(2);
+                    if (Token::Match(paramTok, "const| %name% &")) {
+                        if (paramTok->str() == "const" &&
+                            paramTok->strAt(1) == scope->className)
                             operatorEqReturnError(func->retDef, scope->className);
-                        else if (func->tokenDef->strAt(2) == scope->className)
+                        else if (paramTok->str() == scope->className)
                             operatorEqReturnError(func->retDef, scope->className);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1245,11 +1245,12 @@ void CheckClass::operatorEq()`
`1245`	`1245`	`}`
`1246`	`1246`	`if (!returnSelfRef) {`
`1247`	`1247`	`// make sure we really have a copy assignment operator`
`1248`		`- if (Token::Match(func->tokenDef->tokAt(2), "const\| %name% &")) {`
`1249`		`- if (func->tokenDef->strAt(2) == "const" &&`
`1250`		`- func->tokenDef->strAt(3) == scope->className)`
	`1248`	`+ const Token *paramTok = func->tokenDef->tokAt(2);`
	`1249`	`+ if (Token::Match(paramTok, "const\| %name% &")) {`
	`1250`	`+ if (paramTok->str() == "const" &&`
	`1251`	`+ paramTok->strAt(1) == scope->className)`
`1251`	`1252`	`operatorEqReturnError(func->retDef, scope->className);`
`1252`		`- else if (func->tokenDef->strAt(2) == scope->className)`
	`1253`	`+ else if (paramTok->str() == scope->className)`
`1253`	`1254`	`operatorEqReturnError(func->retDef, scope->className);`
`1254`	`1255`	`}`
`1255`	`1256`	`}`