Merge pull request #81 from christophschlosser/memberpointer

 Parse member pointers correctly 

5 files changed, 23 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 2dfc470..d4b5e59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ node_modules
 *.vsix
 coverage/
 .DS_Store
+/npm-debug.log
diff --git a/src/Lang/Cpp/CppParser.ts b/src/Lang/Cpp/CppParser.ts
index 0b34347..746c11c 100644
--- a/src/Lang/Cpp/CppParser.ts
+++ b/src/Lang/Cpp/CppParser.ts
@@ -695,6 +695,17 @@ export default class CppParser implements ICodeParser {
             return this.GetArgumentFromFuncPtr(copy);
         }
 
+        // Handle member pointers
+        for (let token: number = 0; token < copy.nodes.length - 1; token++) {
+            const firstToken: CppToken = copy.nodes[token] as CppToken;
+            const secondToken: CppToken = copy.nodes[token + 1] as CppToken;
+
+            if (firstToken.type === CppTokenType.Symbol && secondToken.type === CppTokenType.Pointer &&
+                firstToken.value.endsWith("::")) {
+                    firstToken.type = CppTokenType.MemberPointer;
+            }
+        }
+
         return this.GetDefaultArgument(copy);
     }
 
diff --git a/src/Lang/Cpp/CppToken.ts b/src/Lang/Cpp/CppToken.ts
index f229e8f..61b78b7 100644
--- a/src/Lang/Cpp/CppToken.ts
+++ b/src/Lang/Cpp/CppToken.ts
@@ -13,6 +13,7 @@ export enum CppTokenType {
     CommentLine,
     Ellipsis,
     Attribute,
+    MemberPointer,
 }
 
 export class CppToken {
diff --git a/src/test/CppTests/FunctionPointer.test.ts b/src/test/CppTests/FunctionPointer.test.ts
index a353380..7a4383c 100644
--- a/src/test/CppTests/FunctionPointer.test.ts
+++ b/src/test/CppTests/FunctionPointer.test.ts
@@ -39,4 +39,9 @@ suite("C++ - Function pointer Tests", () => {
         assert.equal("/**\n * @brief \n * \n * @param puts \n * @param str "
             + "\n * @return const struct foo(*)(const char*) \n */", result);
     });
+
+    test("Memberpointer in function pointer", () => {
+        const result = testSetup.SetLine("void foo(void (SomeClass::* func)());").GetResult();
+        assert.equal("/**\n * @brief \n * \n * @param func \n */", result);
+    });
 });
diff --git a/src/test/CppTests/Parameters.test.ts b/src/test/CppTests/Parameters.test.ts
index 8505826..6e7293b 100644
--- a/src/test/CppTests/Parameters.test.ts
+++ b/src/test/CppTests/Parameters.test.ts
@@ -252,4 +252,9 @@ suite("C++ - Parameters Tests", () => {
         const result = testSetup.SetLine("void foo(double a1 = 0xa.bp10l_deg_test, int b);").GetResult();
         assert.equal("/**\n * @brief \n * \n * @param a1 \n * @param b \n */", result);
     });
+
+    test("Member pointer as parameter", () => {
+        const result = testSetup.SetLine("void test(int foo::* memberPointer);").GetResult();
+        assert.equal("/**\n * @brief \n * \n * @param memberPointer \n */", result);
+    });
 });