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

9768: Fix ast with throw in the middle of return 

```
int f(bool x)
{
    return x ? 0 : throw 0;
}
```

The `throw` part was not included in the ast, leading to an invalid
ternary operator.
This commit is contained in:
Ken-Patrick Lehrmann 2020-06-14 14:46:16 +02:00
parent f44192e94b
commit 4023a487ff
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenlist.cpp
View File

@ -762,7 +762,9 @@ static void compileTerm(Token *&tok, AST_state& state)
if (Token::Match(tok, "return|case") || (state.cpp && tok->str() == "throw")) { if (Token::Match(tok, "return|case") || (state.cpp && tok->str() == "throw")) {
if (tok->str() == "case") if (tok->str() == "case")
state.inCase = true; state.inCase = true;
const bool tokIsReturn = tok->str() == "return";
compileUnaryOp(tok, state, compileExpression); compileUnaryOp(tok, state, compileExpression);
if (tokIsReturn)
state.op.pop(); state.op.pop();
if (state.inCase && Token::simpleMatch(tok, ": ;")) { if (state.inCase && Token::simpleMatch(tok, ": ;")) {
state.inCase = false; state.inCase = false;

3
test/testtokenize.cpp
View File

@ -7484,6 +7484,8 @@ private:
ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? b, c : (d, e));")); ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? b, c : (d, e));"));
ASSERT_EQUALS("ab35,4:?foo(:?return", testAst("return (a ? b ? (3,5) : 4 : foo());")); ASSERT_EQUALS("ab35,4:?foo(:?return", testAst("return (a ? b ? (3,5) : 4 : foo());"));
ASSERT_EQUALS("check(result_type00,{invalid:?return", testAst("return check() ? result_type {0, 0} : invalid;")); ASSERT_EQUALS("check(result_type00,{invalid:?return", testAst("return check() ? result_type {0, 0} : invalid;"));
ASSERT_EQUALS("x01:?return", testAst("return x ? 0 : 1;"));
ASSERT_EQUALS("x00throw:?return", testAst("return x ? 0 : throw 0;")); // #9768
ASSERT_EQUALS("a\"\"=", testAst("a=\"\"")); ASSERT_EQUALS("a\"\"=", testAst("a=\"\""));
ASSERT_EQUALS("a\'\'=", testAst("a=\'\'")); ASSERT_EQUALS("a\'\'=", testAst("a=\'\'"));
@ -7927,6 +7929,7 @@ private:
ASSERT_EQUALS("0case", testAst("case 0:")); ASSERT_EQUALS("0case", testAst("case 0:"));
ASSERT_EQUALS("12+case", testAst("case 1+2:")); ASSERT_EQUALS("12+case", testAst("case 1+2:"));
ASSERT_EQUALS("xyz:?case", testAst("case (x?y:z):")); ASSERT_EQUALS("xyz:?case", testAst("case (x?y:z):"));
ASSERT_EQUALS("switchx( 1case y++ 2case", testAst("switch(x){case 1:{++y;break;case 2:break;}}"));
} }
void astrefqualifier() { void astrefqualifier() {