C++: record "export" in the property field if the keyword is put at a…

… namespace alias Signed-off-by: Masatake YAMATO <yamato@redhat.com>
mamh-mixed · May 23, 2024 · 8cdecb1 · 8cdecb1
1 parent fcffa4b
commit 8cdecb1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/Units/parser-cxx.r/export-namespace-alias.d/args.ctags b/Units/parser-cxx.r/export-namespace-alias.d/args.ctags
@@ -0,0 +1,4 @@
+--sort=no
+--fields-C++=+{properties}
+--fields=+K
+--kinds-C++=+{alias}
diff --git a/Units/parser-cxx.r/export-namespace-alias.d/expected.tags b/Units/parser-cxx.r/export-namespace-alias.d/expected.tags
@@ -0,0 +1,4 @@
+mylib	input.cpp	/^export module mylib;$/;"	module	properties:export
+X	input.cpp	/^export namespace X {$/;"	namespace	file:	properties:export
+i	input.cpp	/^	 int i;$/;"	variable	namespace:X	typeref:typename:int
+Z	input.cpp	/^export namespace Z = X;$/;"	alias	file:	properties:export	name:X
diff --git a/Units/parser-cxx.r/export-namespace-alias.d/input.cpp b/Units/parser-cxx.r/export-namespace-alias.d/input.cpp
@@ -0,0 +1,7 @@
+export module mylib;
+
+export namespace X {
+	 int i;
+}
+
+export namespace Z = X;
diff --git a/Units/parser-cxx.r/export-namespace-alias.d/validator b/Units/parser-cxx.r/export-namespace-alias.d/validator
@@ -0,0 +1 @@
+cxx20+module
diff --git a/parsers/cxx/cxx_parser_namespace.c b/parsers/cxx/cxx_parser_namespace.c
@@ -138,6 +138,10 @@ bool cxxParserParseNamespace(void)
 					// This is highly questionable but well.. it's how old ctags did, so we do.
 					tag->isFileScope = !isInputHeaderFile();
 
+					vString * pszProperties = NULL;
+					if(uProperties)
+						pszProperties = cxxTagSetProperties(uProperties);
+
 					CXXToken * pAliasedName = cxxTokenChainExtractRange(
 							pFirstIdentifier,
 							pLastIdentifier,
@@ -152,6 +156,7 @@ bool cxxParserParseNamespace(void)
 
 					cxxTagCommit(NULL);
 
+					vStringDelete (pszProperties); /* NULL is acceptable.  */
 					cxxTokenDestroy(pAliasedName);
 				}