C++: support "export struct ..."

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
universal-ctags · Feb 21, 2024 · b99e979 · b99e979
1 parent 8362c9b
commit b99e979
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 0 deletions.
diff --git a/Units/parser-cxx.r/export-2.d/expected.tags b/Units/parser-cxx.r/export-2.d/expected.tags
@@ -7,3 +7,9 @@ french	input.cpp	/^    char const* french()  { return "Salut!"; }$/;"	f	namespac
 x	input.cpp	/^export enum x { a = 1 };$/;"	g	file:	properties:export
 a	input.cpp	/^export enum x { a = 1 };$/;"	e	enum:x	file:
 td	input.cpp	/^export typedef int td;$/;"	t	typeref:typename:int	file:	properties:export
+s_	input.cpp	/^struct s_ {$/;"	s	file:
+mbr	input.cpp	/^  int mbr;$/;"	m	struct:s_	typeref:typename:int	file:
+s	input.cpp	/^export struct s {$/;"	s	file:	properties:export
+mbr	input.cpp	/^  int mbr;$/;"	m	struct:s	typeref:typename:int	file:
+s__	input.cpp	/^struct s__ {$/;"	s	file:
+mbr	input.cpp	/^  int mbr;$/;"	m	struct:s__	typeref:typename:int	file:
diff --git a/Units/parser-cxx.r/export-2.d/input.cpp b/Units/parser-cxx.r/export-2.d/input.cpp
@@ -17,3 +17,15 @@ export namespace hi
 export enum x { a = 1 };
 
 export typedef int td;
+
+struct s_ {
+  int mbr;
+};
+
+export struct s {
+  int mbr;
+};
+
+struct s__ {
+  int mbr;
+};
diff --git a/Units/parser-cxx.r/export-3.d/expected.tags b/Units/parser-cxx.r/export-3.d/expected.tags
@@ -3,10 +3,14 @@ X	input.cpp	/^namespace X {$/;"	n	file:
 a	input.cpp	/^  int a;$/;"	v	namespace:X	typeref:typename:int
 x	input.cpp	/^    int x;$/;"	v	namespace:X	typeref:typename:int	properties:export
 f	input.cpp	/^    int f(int i);$/;"	p	namespace:X	typeref:typename:int	file:	properties:export
+u	input.cpp	/^    union u {$/;"	u	namespace:X	file:	properties:export
+mbr	input.cpp	/^    int mbr;$/;"	m	union:X::u	typeref:typename:int	file:
 b	input.cpp	/^  int b;$/;"	v	namespace:X	typeref:typename:int
 m	input.cpp	/^int m;$/;"	v	typeref:typename:int
 z	input.cpp	/^  int z;$/;"	v	typeref:typename:int	properties:export
 E	input.cpp	/^  enum E { a = 1 };$/;"	g	file:	properties:export
 a	input.cpp	/^  enum E { a = 1 };$/;"	e	enum:E	file:
 td	input.cpp	/^  typedef int td;$/;"	t	typeref:typename:int	file:	properties:export
+c	input.cpp	/^  class c {$/;"	c	file:	properties:export
+mbr	input.cpp	/^    int mbr;$/;"	m	class:c	typeref:typename:int	file:
 n	input.cpp	/^int n;$/;"	v	typeref:typename:int
diff --git a/Units/parser-cxx.r/export-3.d/input.cpp b/Units/parser-cxx.r/export-3.d/input.cpp
@@ -5,6 +5,10 @@ namespace X {
   export {
     int x;
     int f(int i);
+    union u {
+    int mbr;
+  };
+
   }
   int b;
 };
@@ -15,5 +19,8 @@ export {
   int z;
   enum E { a = 1 };
   typedef int td;
+  class c {
+    int mbr;
+  };
 }
 int n;
diff --git a/parsers/cxx/cxx_parser.c b/parsers/cxx/cxx_parser.c
@@ -1361,9 +1361,18 @@ static bool cxxParserParseClassStructOrUnionInternal(
 
 		tag->isFileScope = !isInputHeaderFile();
 
+		unsigned int uProperties = 0;
+		if(uInitialKeywordState & CXXParserKeywordStateSeenExport)
+			uProperties |= CXXTagPropertyExport;
+		vString * pszProperties = NULL;
+
+		if(uProperties)
+			pszProperties = cxxTagSetProperties(uProperties);
+
 		iCorkQueueIndex = cxxTagCommit(&iCorkQueueIndexFQ);
 		cxxTagUseTokenAsPartOfDefTag(iCorkQueueIndex, pClassName);
 
+		vStringDelete (pszProperties); /* NULL is acceptable. */
 	}
 
 	cxxScopePush(