summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Schlosser <christoph@linux.com>2018-10-04 19:50:47 +0200
committerChristoph Schlosser <christophschlosser@users.noreply.github.com>2018-10-04 22:03:55 +0200
commit94d7fb5940e81d3f11d0d47bedf4780651a6b900 (patch)
treeef58f21372a2cc61a3453d4c04e5bbc9b4eaf4ff
parent5d2f5cfaff8bd69aa779c957794cda11814d2830 (diff)
downloaddoxdocgen-94d7fb5940e81d3f11d0d47bedf4780651a6b900.tar.gz
Fix type as variable name
-rw-r--r--src/Lang/Cpp/CppParser.ts2
-rw-r--r--src/test/CppTests/Parameters.test.ts8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/Lang/Cpp/CppParser.ts b/src/Lang/Cpp/CppParser.ts
index 746c11c..f080483 100644
--- a/src/Lang/Cpp/CppParser.ts
+++ b/src/Lang/Cpp/CppParser.ts
@@ -260,7 +260,7 @@ export default class CppParser implements ICodeParser {
// Special case group up the fundamental types with the modifiers.
// tslint:disable-next-line:max-line-length
- let reMatch: string = (x.match("^(unsigned|signed|short|long|int|char|double)(\\s+(unsigned|signed|short|long|int|char|double))+(?!a-z|A-Z|:|_|\\d)") || [])[0];
+ let reMatch: string = (x.match("^(unsigned|signed|short|long|int|char|double|float)(\\s*(unsigned|signed|short|long|int|char|double|float)\\s)+(?!a-z|A-Z|:|_|\\d)") || [])[0];
if (reMatch !== undefined) {
return reMatch.trim();
}
diff --git a/src/test/CppTests/Parameters.test.ts b/src/test/CppTests/Parameters.test.ts
index 6e7293b..9487fe9 100644
--- a/src/test/CppTests/Parameters.test.ts
+++ b/src/test/CppTests/Parameters.test.ts
@@ -257,4 +257,12 @@ suite("C++ - Parameters Tests", () => {
const result = testSetup.SetLine("void test(int foo::* memberPointer);").GetResult();
assert.equal("/**\n * @brief \n * \n * @param memberPointer \n */", result);
});
+
+ test("Type as variable name", () => {
+ let result = testSetup.SetLine("void MapPoint(double latitude, double longtitude) const;").GetResult();
+ assert.equal("/**\n * @brief \n * \n * @param latitude \n * @param longtitude \n */", result);
+
+ result = testSetup.SetLine("void MapPoint(double latitude, double long int floattitude) const;").GetResult();
+ assert.equal("/**\n * @brief \n * \n * @param latitude \n * @param floattitude \n */", result);
+ });
});