walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed compiler errors with GCC

This commit is contained in:
PKEuS 2012-01-02 13:10:35 +01:00
parent 38ddcde7b0
commit 08805dd9fe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tokenize.cpp
View File

@ -4019,18 +4019,18 @@ void Tokenizer::setVarId()
} }
} }
bool linkBrackets(Tokenizer* tokenizer, std::stack<const Token*>& type, std::stack<Token*>& links, Token* token, char open, char close) static bool linkBrackets(Tokenizer* tokenizer, std::stack<const Token*>& type, std::stack<Token*>& links, Token* token, char open, char close)
{ {
if (token->str().back() == open) { if (token->str()[0] == open) {
links.push(token); links.push(token);
type.push(token); type.push(token);
} else if (token->str().back() == close) { } else if (token->str()[0] == close) {
if (links.empty()) { if (links.empty()) {
// Error, { and } don't match. // Error, { and } don't match.
tokenizer->syntaxError(token, open); tokenizer->syntaxError(token, open);
return false; return false;
} }
if (type.top()->str().back() != open) { if (type.top()->str()[0] != open) {
tokenizer->syntaxError(type.top(), type.top()->str()[0]); tokenizer->syntaxError(type.top(), type.top()->str()[0]);
return false; return false;
} }
@ -4053,7 +4053,7 @@ bool Tokenizer::createLinks()
token->link(0); token->link(0);
} }
bool validSyntax = validSyntax = linkBrackets(this, type, links1, token, '{', '}'); bool validSyntax = linkBrackets(this, type, links1, token, '{', '}');
if (!validSyntax) if (!validSyntax)
return false; return false;