Merge pull request universal-ctags#962 from pragmaware/struct-initial…

…ization Fix bug universal-ctags#945.
Sirlsliang · May 27, 2016 · a9c6e5b · a9c6e5b
2 parents 0887a54 + 926e4df
commit a9c6e5b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/....r/c-large-i-option-handling.b/args.ctags → Units/parser-c.r/bug945.c.d/args.ctags b/....r/c-large-i-option-handling.b/args.ctags → Units/parser-c.r/bug945.c.d/args.ctags
diff --git a/...c-large-i-option-handling.b/expected.tags → Units/parser-c.r/bug945.c.d/expected.tags b/...c-large-i-option-handling.b/expected.tags → Units/parser-c.r/bug945.c.d/expected.tags
diff --git a/...r-c.r/c-large-i-option-handling.b/input.c → Units/parser-c.r/bug945.c.d/input.c b/...r-c.r/c-large-i-option-handling.b/input.c → Units/parser-c.r/bug945.c.d/input.c
@@ -1,3 +1,9 @@
+/*
+  Bug 945@github reported by masatake on 21/05/2016.
+  The code below was treated as a struct declaration instead
+  of variable declaration.
+*/
+
 /* Taken from linux-3.10.0-229.fc21.x86_64/net/dsa/tag_edsa.c */
 struct packet_type edsa_packet_type __read_mostly = {
 	.type	= cpu_to_be16(ETH_P_EDSA),

diff --git a/parsers/cxx/cxx_parser.c b/parsers/cxx/cxx_parser.c
@@ -569,7 +569,7 @@ boolean cxxParserParseClassStructOrUnion(
 			CXXTokenTypeSmallerThanSign;
 
 	if(eTagKind != CXXTagKindCLASS)
-		uTerminatorTypes |= CXXTokenTypeParenthesisChain;
+		uTerminatorTypes |= CXXTokenTypeParenthesisChain | CXXTokenTypeAssignment;
 
 	boolean bRet;
 
@@ -639,6 +639,26 @@ boolean cxxParserParseClassStructOrUnion(
 		return TRUE;
 	}
 
+	if(cxxTokenTypeIs(g_cxx.pToken,CXXTokenTypeAssignment))
+	{
+		if(g_cxx.pTokenChain->iCount > 3)
+		{
+			// struct X Y = ...;
+			cxxParserExtractVariableDeclarations(g_cxx.pTokenChain,0);
+		}
+
+		// Skip the initialization (which almost certainly contains a block)
+		if(!cxxParserParseUpToOneOf(CXXTokenTypeEOF | CXXTokenTypeSemicolon))
+		{
+			CXX_DEBUG_LEAVE_TEXT("Failed to parse up to EOF/semicolon");
+			return FALSE;
+		}
+
+		cxxParserNewStatement();
+		CXX_DEBUG_LEAVE();
+		return TRUE;
+	}
+
 	if(cxxTokenTypeIs(g_cxx.pToken,CXXTokenTypeEOF))
 	{
 		// tolerate EOF, just ignore this