Merge pull request #3344 from masatake/c--func-after-typedef-for-func…

…tion-returning-struct

Cxx: add missing code for resetting typedef parsing state
MERGING without getting a review from @pragmaware.

Units/parser-c.r/func-after-typedef-for-fptr-returning-enum.d/args.ctags

@@ -0,0 +1,2 @@
+--sort=no
+--fields=+S

Units/parser-c.r/func-after-typedef-for-fptr-returning-enum.d/expected.tags

@@ -0,0 +1,4 @@
+s	input.c	/^enum s { E };$/;"	g	file:
+E	input.c	/^enum s { E };$/;"	e	enum:s	file:
+g	input.c	/^typedef enum s (*g)(void);$/;"	t	typeref:enum:s (*)(void)	file:
+f	input.c	/^void f(void){}$/;"	f	typeref:typename:void	signature:(void)

Units/parser-c.r/func-after-typedef-for-fptr-returning-enum.d/input.c

@@ -0,0 +1,3 @@
+enum s { E };
+typedef enum s (*g)(void);
+void f(void){}

Units/parser-c.r/func-after-typedef-for-fptr-returning-struct.d/args.ctags

@@ -0,0 +1,2 @@
+--sort=no
+--fields=+S

Units/parser-c.r/func-after-typedef-for-fptr-returning-struct.d/expected.tags

@@ -0,0 +1,3 @@
+s	input.c	/^struct s {};$/;"	s	file:
+g	input.c	/^typedef struct s (*g)(void);$/;"	t	typeref:struct:s (*)(void)	file:
+f	input.c	/^void f(void){}$/;"	f	typeref:typename:void	signature:(void)

Units/parser-c.r/func-after-typedef-for-fptr-returning-struct.d/input.c

@@ -0,0 +1,3 @@
+struct s {};
+typedef struct s (*g)(void);
+void f(void){}

parsers/cxx/cxx_parser.c

@@ -661,8 +661,12 @@ bool cxxParserParseEnum(void)
 	{
 		if(uInitialKeywordState & CXXParserKeywordStateSeenTypedef)
 		{
+			bool bR;
+			g_cxx.uKeywordState &= ~CXXParserKeywordStateSeenTypedef;
 			CXX_DEBUG_LEAVE_TEXT("Found parenthesis after typedef: parsing as generic typedef");
-			return cxxParserParseGenericTypedef();
+			bR = cxxParserParseGenericTypedef();
+			cxxParserNewStatement();
+			return bR;
 		}
 		// probably a function declaration/prototype
 		// something like enum x func()....
@@ -1066,8 +1070,12 @@ static bool cxxParserParseClassStructOrUnionInternal(
 	{
 		if(uInitialKeywordState & CXXParserKeywordStateSeenTypedef)
 		{
+			bool bR;
+			g_cxx.uKeywordState &= ~CXXParserKeywordStateSeenTypedef;
 			CXX_DEBUG_LEAVE_TEXT("Found parenthesis after typedef: parsing as generic typedef");
-			return cxxParserParseGenericTypedef();
+			bR = cxxParserParseGenericTypedef();
+			cxxParserNewStatement();
+			return bR;
 		}
 
 		// probably a function declaration/prototype