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

Attempt to fix travis build

This commit is contained in:
PKEuS 2014-05-25 22:11:56 +02:00
parent a407b55945
commit 8f083af1e4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tokenlist.cpp
View File

@ -510,7 +510,6 @@ static void compilePrecedence2(Token *&tok, std::stack<Token*> &op, unsigned int
op.push(roundBracket); op.push(roundBracket);
compileUnaryOp(squareBracket, 0, op, depth); compileUnaryOp(squareBracket, 0, op, depth);
tok = curlyBracket->link()->next(); tok = curlyBracket->link()->next();
//compilePrecedence2(tok, op, depth);
} else { } else {
Token* tok2 = tok; Token* tok2 = tok;
compileBinOp(tok, compileExpression, op, depth); compileBinOp(tok, compileExpression, op, depth);
@ -519,7 +518,7 @@ static void compilePrecedence2(Token *&tok, std::stack<Token*> &op, unsigned int
} else if (tok->str() == "(" && (!iscast(tok) || Token::Match(tok->previous(), "if|while|for|switch|catch"))) { } else if (tok->str() == "(" && (!iscast(tok) || Token::Match(tok->previous(), "if|while|for|switch|catch"))) {
Token* tok2 = tok; Token* tok2 = tok;
tok = tok->next(); tok = tok->next();
bool opPrevTopSquare = op.size() > 0 && op.top() && op.top()->str() == "["; bool opPrevTopSquare = !op.empty() && op.top() && op.top()->str() == "[";
compileExpression(tok, op, depth); compileExpression(tok, op, depth);
tok = tok2; tok = tok2;
if ((tok->previous() && tok->previous()->isName() && !Token::Match(tok->previous(), "return|throw")) if ((tok->previous() && tok->previous()->isName() && !Token::Match(tok->previous(), "return|throw"))