From fc8b744aac786e416e6663490f2efbf40b016964 Mon Sep 17 00:00:00 2001 From: Christoph Schlosser Date: Mon, 25 Jun 2018 13:51:48 +0200 Subject: Parse member pointers correctly --- src/Lang/Cpp/CppParser.ts | 11 +++++++++++ src/Lang/Cpp/CppToken.ts | 1 + src/test/CppTests/MemberPointers.test.ts | 23 +++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 src/test/CppTests/MemberPointers.test.ts (limited to 'src') 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/MemberPointers.test.ts b/src/test/CppTests/MemberPointers.test.ts new file mode 100644 index 0000000..38410c4 --- /dev/null +++ b/src/test/CppTests/MemberPointers.test.ts @@ -0,0 +1,23 @@ +// +// Note: This example test is leveraging the Mocha test framework. +// Please refer to their documentation on https://mochajs.org/ for help. +// + +// The module 'assert' provides assertion methods from node +import * as assert from "assert"; + +// You can import and use all API from the 'vscode' module +// as well as import your extension to test it +import * as vscode from "vscode"; +import TestSetup from "./TestSetup"; + +// Defines a Mocha test suite to group tests of similar kind together +suite("C++ - Member pointers tests", () => { + const testSetup: TestSetup = new TestSetup("void foo();"); + + // tests + test("Simple", () => { + const result = testSetup.SetLine("void test(int foo::* memberPointer);").GetResult(); + assert.equal("/**\n * @brief \n * \n * @param memberPointer \n */", result); + }); +}); -- cgit v1.2.3 From d438622d71b94789b7ccc672cdd9d81f77570f87 Mon Sep 17 00:00:00 2001 From: Christoph Schlosser Date: Fri, 6 Jul 2018 19:49:02 +0200 Subject: Update unit tests Remove seperate file. Move into parameters test. Add new one to function pointers. --- src/test/CppTests/FunctionPointer.test.ts | 5 +++++ src/test/CppTests/MemberPointers.test.ts | 23 ----------------------- src/test/CppTests/Parameters.test.ts | 5 +++++ 3 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 src/test/CppTests/MemberPointers.test.ts (limited to 'src') 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/MemberPointers.test.ts b/src/test/CppTests/MemberPointers.test.ts deleted file mode 100644 index 38410c4..0000000 --- a/src/test/CppTests/MemberPointers.test.ts +++ /dev/null @@ -1,23 +0,0 @@ -// -// Note: This example test is leveraging the Mocha test framework. -// Please refer to their documentation on https://mochajs.org/ for help. -// - -// The module 'assert' provides assertion methods from node -import * as assert from "assert"; - -// You can import and use all API from the 'vscode' module -// as well as import your extension to test it -import * as vscode from "vscode"; -import TestSetup from "./TestSetup"; - -// Defines a Mocha test suite to group tests of similar kind together -suite("C++ - Member pointers tests", () => { - const testSetup: TestSetup = new TestSetup("void foo();"); - - // tests - test("Simple", () => { - const result = testSetup.SetLine("void test(int foo::* memberPointer);").GetResult(); - assert.equal("/**\n * @brief \n * \n * @param memberPointer \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); + }); }); -- cgit v1.2.3