Merge pull request #2129 from pragmaware/cxx-multidimensional-array-p…

…arameters CXX: Generate tags for multidimensional array parameters
universal-ctags · Jul 3, 2019 · b9bde3d · b9bde3d
2 parents 2b0aa59 + 76446a2
commit b9bde3d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/Units/parser-cxx.r/functions.cpp.d/expected.tags b/Units/parser-cxx.r/functions.cpp.d/expected.tags
@@ -18,6 +18,12 @@ f08	input.cpp	/^void (*f08(void (*)(int *f08a01)))(int *)$/;"	f	typeref:typename
 f08a01	input.cpp	/^void (*f08(void (*)(int *f08a01)))(int *)$/;"	z	function:f08	typeref:typename:void (*)(int *)	file:
 f09	input.cpp	/^int f09(char *((*f09a01)()))$/;"	f	typeref:typename:int	signature:(char * ((* f09a01)()))	end:74
 f09a01	input.cpp	/^int f09(char *((*f09a01)()))$/;"	z	function:f09	typeref:typename:char * ((*)())	file:
+f10	input.cpp	/^int f10(int f10a01,int f10a02[],int f10a03[2][3],int (f10a04)[],int (f10a05)[][5])$/;"	f	typeref:typename:int	signature:(int f10a01,int f10a02[],int f10a03[2][3],int (f10a04)[],int (f10a05)[][5])	end:79
+f10a01	input.cpp	/^int f10(int f10a01,int f10a02[],int f10a03[2][3],int (f10a04)[],int (f10a05)[][5])$/;"	z	function:f10	typeref:typename:int	file:
+f10a02	input.cpp	/^int f10(int f10a01,int f10a02[],int f10a03[2][3],int (f10a04)[],int (f10a05)[][5])$/;"	z	function:f10	typeref:typename:int[]	file:
+f10a03	input.cpp	/^int f10(int f10a01,int f10a02[],int f10a03[2][3],int (f10a04)[],int (f10a05)[][5])$/;"	z	function:f10	typeref:typename:int[2][3]	file:
+f10a04	input.cpp	/^int f10(int f10a01,int f10a02[],int f10a03[2][3],int (f10a04)[],int (f10a05)[][5])$/;"	z	function:f10	typeref:typename:int ()[]	file:
+f10a05	input.cpp	/^int f10(int f10a01,int f10a02[],int f10a03[2][3],int (f10a04)[],int (f10a05)[][5])$/;"	z	function:f10	typeref:typename:int ()[][5]	file:
 p01	input.cpp	/^int p01(int p01a01,int p01a02);$/;"	p	typeref:typename:int	file:	signature:(int p01a01,int p01a02)
 p02	input.cpp	/^unsigned short int * p02(unsigned int & p02a01,...);$/;"	p	typeref:typename:unsigned short int *	file:	signature:(unsigned int & p02a01,...)
 p03	input.cpp	/^auto p03(const int & p03a01,void * p03a02) -> const int &;$/;"	p	typeref:typename:const int &	file:	signature:(const int & p03a01,void * p03a02)
@@ -27,7 +33,7 @@ p06	input.cpp	/^		auto p06(n01::c01 && p06a01) -> type01 *;$/;"	p	namespace:n01:
 p06	input.cpp	/^auto n01::n02::p06(n01::c01 && p06a01) -> n01::n02::type01 *;$/;"	p	class:n01::n02	typeref:typename:n01::n02::type01 *	file:	signature:(n01::c01 && p06a01)
 p07	input.cpp	/^unsigned int p07(int (*p07a01)(int * x1,int x2),...);$/;"	p	typeref:typename:unsigned int	file:	signature:(int (* p07a01)(int * x1,int x2),...)
 p08	input.cpp	/^void (*p08(void (*)(int *p08a01)))(int *);$/;"	p	typeref:typename:void (*)(int *)	file:	signature:(void (*)(int * p08a01))
-t01	input.cpp	/^template <typename T> std::unique_ptr<T> t01(T && t01a01)$/;"	f	typeref:typename:std::unique_ptr<T>	signature:(T && t01a01)	end:80
+t01	input.cpp	/^template <typename T> std::unique_ptr<T> t01(T && t01a01)$/;"	f	typeref:typename:std::unique_ptr<T>	signature:(T && t01a01)	end:85
 t01a01	input.cpp	/^template <typename T> std::unique_ptr<T> t01(T && t01a01)$/;"	z	function:t01	typeref:typename:T &&	file:
-t02	input.cpp	/^template <typename T> auto t02(T && t02a01) -> std::unique_ptr<T>$/;"	f	typeref:typename:std::unique_ptr<T>	signature:(T && t02a01)	end:85
+t02	input.cpp	/^template <typename T> auto t02(T && t02a01) -> std::unique_ptr<T>$/;"	f	typeref:typename:std::unique_ptr<T>	signature:(T && t02a01)	end:90
 t02a01	input.cpp	/^template <typename T> auto t02(T && t02a01) -> std::unique_ptr<T>$/;"	z	function:t02	typeref:typename:T &&	file:
diff --git a/Units/parser-cxx.r/functions.cpp.d/input.cpp b/Units/parser-cxx.r/functions.cpp.d/input.cpp
@@ -73,6 +73,11 @@ int f09(char *((*f09a01)()))
 	return 0;
 }
 
+int f10(int f10a01,int f10a02[],int f10a03[2][3],int (f10a04)[],int (f10a05)[][5])
+{
+	return 0;
+}
+
 // Valid function templates
 template <typename T> std::unique_ptr<T> t01(T && t01a01)
 {

diff --git a/parsers/cxx/cxx_parser_function.c b/parsers/cxx/cxx_parser_function.c
@@ -1994,23 +1994,29 @@ bool cxxParserTokenChainLooksLikeFunctionParameterList(
 					pIdentifier = t->pPrev;
 				} else if(t->pPrev->pPrev)
 				{
-					bool bPrevIsSquareParenthesis = cxxTokenTypeIs(
-							t->pPrev,
+					CXXToken *pNonSquareParenthesis = cxxTokenChainPreviousTokenNotOfType(
+							t,
 							CXXTokenTypeSquareParenthesisChain
 						);
 
+					bool bPrevIsSquareParenthesis = (
+							pNonSquareParenthesis &&
+							(pNonSquareParenthesis != t->pPrev)
+						);
+
 					if(
 						bPrevIsSquareParenthesis &&
-						cxxTokenTypeIs(t->pPrev->pPrev,CXXTokenTypeIdentifier)
+						cxxTokenTypeIs(pNonSquareParenthesis,CXXTokenTypeIdentifier)
 					)
 					{
 						// type var[]
-						pIdentifier = t->pPrev->pPrev;
+						// type var[]...[]
+						pIdentifier = pNonSquareParenthesis;
 					} else if(
 						bPrevIsSquareParenthesis &&
-						cxxTokenTypeIs(t->pPrev->pPrev,CXXTokenTypeParenthesisChain) &&
+						cxxTokenTypeIs(pNonSquareParenthesis,CXXTokenTypeParenthesisChain) &&
 						(pIdentifier = cxxTokenChainFirstTokenOfType(
-								t->pPrev->pPrev->pChain,
+								pNonSquareParenthesis->pChain,
 								CXXTokenTypeIdentifier
 							))
 					)