diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index aa4c00af8..1fcb7184b 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -1790,6 +1790,11 @@ void Tokenizer::simplifyTypedef() { if (!inCast && !inSizeof) tok2 = tok2->next(); + + // skip over reference + if (tok2->str() == "&") + tok2 = tok2->next(); + tok2 = copyTokens(tok2, arrayStart, arrayEnd); tok2 = tok2->next(); diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp index a546b3654..c2b76a51b 100644 --- a/test/testsimplifytokens.cpp +++ b/test/testsimplifytokens.cpp @@ -243,6 +243,7 @@ private: TEST_CASE(simplifyTypedef80); // ticket #2587 TEST_CASE(simplifyTypedef81); // ticket #2603 TEST_CASE(simplifyTypedef82); // ticket #2403 + TEST_CASE(simplifyTypedef83); // ticket #2620 TEST_CASE(simplifyTypedefFunction1); TEST_CASE(simplifyTypedefFunction2); // ticket #1685 @@ -4961,6 +4962,17 @@ private: ASSERT_EQUALS("", errout.str()); } + void simplifyTypedef83() // ticket #2620 + { + const char code[] = "typedef char Str[10];\n" + "void f(Str &cl) { }\n"; + + // The expected result.. + const std::string expected("; " + "void f ( char & cl [ 10 ] ) { }"); + ASSERT_EQUALS(expected, sizeof_(code)); + } + void simplifyTypedefFunction1() { {