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

Fixed #9127 (ast: wrong ast after using and template instantiation)

This commit is contained in:
Daniel Marjamäki 2019-05-12 17:24:42 +02:00
parent 27fad38e00
commit 9f00149674
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenlist.cpp
View File

@ -1199,7 +1199,7 @@ static Token * createAstAtToken(Token *tok, bool cpp)
if (Token::simpleMatch(tok, "( {")) if (Token::simpleMatch(tok, "( {"))
return tok; return tok;
if (Token::Match(tok, "%type% <") && !Token::Match(tok->linkAt(1), "> [({]")) if (Token::Match(tok, "%type% <") && tok->linkAt(1) && !Token::Match(tok->linkAt(1), "> [({]"))
return tok->linkAt(1); return tok->linkAt(1);
if (Token::Match(tok, "%type% %name%|*|&|::") && tok->str() != "return") { if (Token::Match(tok, "%type% %name%|*|&|::") && tok->str() != "return") {

21
test/testtokenize.cpp
View File

@ -447,6 +447,7 @@ private:
TEST_CASE(astcast); TEST_CASE(astcast);
TEST_CASE(astlambda); TEST_CASE(astlambda);
TEST_CASE(astcase); TEST_CASE(astcase);
TEST_CASE(astvardecl);
TEST_CASE(startOfExecutableScope); TEST_CASE(startOfExecutableScope);
@ -6939,8 +6940,6 @@ private:
ASSERT_EQUALS("template < class T > int f ( ) { }", ASSERT_EQUALS("template < class T > int f ( ) { }",
tokenizeAndStringify("template <class T> [[noreturn]] int f(){}", false, true, Settings::Native, "test.cpp", true)); tokenizeAndStringify("template <class T> [[noreturn]] int f(){}", false, true, Settings::Native, "test.cpp", true));
ASSERT_EQUALS("template < class T > [ [ noreturn ] ] int f ( ) { }",
tokenizeAndStringify("template <class T> [[noreturn]] int f(){}", false, true, Settings::Native, "test.cpp", false));
ASSERT_EQUALS("int f ( int i ) ;", ASSERT_EQUALS("int f ( int i ) ;",
tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);", false, true, Settings::Native, "test.cpp", true)); tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);", false, true, Settings::Native, "test.cpp", true));
@ -7117,11 +7116,6 @@ private:
ASSERT_EQUALS("ifCA_FarReadfilenew(,sizeofobjtype(,(!(", testAst("if (!CA_FarRead(file, (void far *)new, sizeof(objtype)))")); // #5910 - don't hang if C code is parsed as C++ ASSERT_EQUALS("ifCA_FarReadfilenew(,sizeofobjtype(,(!(", testAst("if (!CA_FarRead(file, (void far *)new, sizeof(objtype)))")); // #5910 - don't hang if C code is parsed as C++
// Variable declaration
ASSERT_EQUALS("a1[\"\"=", testAst("char a[1]=\"\";"));
ASSERT_EQUALS("charp*(3[char5[3[new=", testAst("char (*p)[3] = new char[5][3];"));
ASSERT_EQUALS("varp=", testAst("const int *var = p;"));
// C++17: if (expr1; expr2) // C++17: if (expr1; expr2)
ASSERT_EQUALS("ifx3=y;(", testAst("if (int x=3; y)")); ASSERT_EQUALS("ifx3=y;(", testAst("if (int x=3; y)"));
@ -7333,6 +7327,19 @@ private:
ASSERT_EQUALS("ab0[1[=", testAst("a=b[0][1];")); ASSERT_EQUALS("ab0[1[=", testAst("a=b[0][1];"));
} }
void astvardecl() {
// Variable declaration
ASSERT_EQUALS("a1[\"\"=", testAst("char a[1]=\"\";"));
ASSERT_EQUALS("charp*(3[char5[3[new=", testAst("char (*p)[3] = new char[5][3];"));
ASSERT_EQUALS("varp=", testAst("const int *var = p;"));
// #9127
const char code1[] = "using uno::Ref;\n"
"Ref<X> r;\n"
"int x(0);";
ASSERT_EQUALS("unoRef:: RefX<r> x0(", testAst(code1));
}
void astunaryop() { // unary operators void astunaryop() { // unary operators
ASSERT_EQUALS("1a--+", testAst("1 + --a")); ASSERT_EQUALS("1a--+", testAst("1 + --a"));
ASSERT_EQUALS("1a--+", testAst("1 + a--")); ASSERT_EQUALS("1a--+", testAst("1 + a--"));