Support rValue references in typedef (cppcheck-opensource#1823)

PKEuS · PKEuS · commit 35b00a5e05e6 · 2014-09-06T19:00:26.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -687,7 +687,7 @@ void Tokenizer::simplifyTypedef()
         }
 
         // check for pointers and references
-        while (Token::Match(tokOffset, "*|&|const")) {
+        while (Token::Match(tokOffset, "*|&|&&|const")) {
             pointers.push_back(tokOffset->str());
             tokOffset = tokOffset->next();
         }
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -304,6 +304,7 @@ class TestSimplifyTokens : public TestFixture {
         TEST_CASE(simplifyTypedef106); // ticket #3619
         TEST_CASE(simplifyTypedef107); // ticket #3963 - bad code => segmentation fault
         TEST_CASE(simplifyTypedef108); // ticket #4777
+        TEST_CASE(simplifyTypedef109); // ticket #1823 - rvalue reference
 
         TEST_CASE(simplifyTypedefFunction1);
         TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@@ -5725,6 +5726,16 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS(expected, tok(code));
     }
 
+    void simplifyTypedef109() {
+        const char code[] = "typedef int&& rref;\n"
+                            "rref var;";
+        const char expected[] = "int & & var ;";
+
+        checkSimplifyTypedef(code);
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void simplifyTypedefFunction1() {
         {
             const char code[] = "typedef void (*my_func)();\n"

Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,7 @@ void Tokenizer::simplifyTypedef()`
`687`	`687`	`}`
`688`	`688`
`689`	`689`	`// check for pointers and references`
`690`		`- while (Token::Match(tokOffset, "*\|&\|const")) {`
	`690`	`+ while (Token::Match(tokOffset, "*\|&\|&&\|const")) {`
`691`	`691`	`pointers.push_back(tokOffset->str());`
`692`	`692`	`tokOffset = tokOffset->next();`
`693`	`693`	`}`