Cxx: add "value" role to "unknown" kind

struct opt file_ops { .read = file_read, .write = file_write, }; The parser with this change extracts "file_read" and "file_write" with "value" role of "unknown" kind. Signed-off-by: Masatake YAMATO <yamato@redhat.com>
universal-ctags · Dec 3, 2022 · ddf135e · ddf135e
1 parent 73fc434
commit ddf135e
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 3 deletions.
diff --git a/Tmain/list-kinds-full.d/stdout-expected.txt b/Tmain/list-kinds-full.d/stdout-expected.txt
@@ -1,7 +1,7 @@
 #LETTER	NAME	ENABLED	REFONLY	NROLES	MASTER	DESCRIPTION
 D	macroparam	no	no	0	C	parameters inside macro definitions
 L	label	no	no	0	C	goto labels
-Y	unknown	no	yes	1	C	unknown identifier
+Y	unknown	no	yes	2	C	unknown identifier
 d	macro	yes	no	2	C	macro definitions
 e	enumerator	yes	no	0	C	enumerators (values inside an enumeration)
 f	function	yes	no	0	C	function definitions
@@ -22,7 +22,7 @@ D	macroparam	no	no	0	C	parameters inside macro definitions
 L	label	no	no	0	C	goto labels
 N	name	no	no	0	NONE	names imported via using scope::symbol
 U	using	no	no	0	NONE	using namespace statements
-Y	unknown	no	yes	1	C	unknown identifier
+Y	unknown	no	yes	2	C	unknown identifier
 Z	tparam	no	no	0	NONE	template parameters
 c	class	yes	no	0	NONE	classes
 d	macro	yes	no	2	C	macro definitions

diff --git a/Tmain/list-roles.d/stdout-expected.txt b/Tmain/list-roles.d/stdout-expected.txt
@@ -19,12 +19,14 @@ Automake       d/directory       script             on      directory for SCRIPT
 Basic          f/function        decl               on      declared
 Bats           S/script          loaded             on      script loaed with "load" command
 C              Y/unknown         ref                off     referenced anyhow
+C              Y/unknown         value              on      used as right side value
 C              d/macro           condition          off     used in part of #if/#ifdef/#elif conditions
 C              d/macro           undef              on      undefined
 C              h/header          local              on      local header
 C              h/header          system             on      system header
 C              m/member          initialized        on      initialized with form '.member = ...'
 C++            Y/unknown         ref                off     referenced anyhow
+C++            Y/unknown         value              on      used as right side value
 C++            d/macro           condition          off     used in part of #if/#ifdef/#elif conditions
 C++            d/macro           undef              on      undefined
 C++            h/header          local              on      local header
@@ -35,6 +37,7 @@ CPreProcessor  d/macro           undef              on      undefined
 CPreProcessor  h/header          local              on      local header
 CPreProcessor  h/header          system             on      system header
 CUDA           Y/unknown         ref                off     referenced anyhow
+CUDA           Y/unknown         value              on      used as right side value
 CUDA           d/macro           condition          off     used in part of #if/#ifdef/#elif conditions
 CUDA           d/macro           undef              on      undefined
 CUDA           h/header          local              on      local header
@@ -144,12 +147,14 @@ Automake       d/directory       script             on      directory for SCRIPT
 Basic          f/function        decl               on      declared
 Bats           S/script          loaded             on      script loaed with "load" command
 C              Y/unknown         ref                off     referenced anyhow
+C              Y/unknown         value              on      used as right side value
 C              d/macro           condition          off     used in part of #if/#ifdef/#elif conditions
 C              d/macro           undef              on      undefined
 C              h/header          local              on      local header
 C              h/header          system             on      system header
 C              m/member          initialized        on      initialized with form '.member = ...'
 C++            Y/unknown         ref                off     referenced anyhow
+C++            Y/unknown         value              on      used as right side value
 C++            d/macro           condition          off     used in part of #if/#ifdef/#elif conditions
 C++            d/macro           undef              on      undefined
 C++            h/header          local              on      local header
@@ -160,6 +165,7 @@ CPreProcessor  d/macro           undef              on      undefined
 CPreProcessor  h/header          local              on      local header
 CPreProcessor  h/header          system             on      system header
 CUDA           Y/unknown         ref                off     referenced anyhow
+CUDA           Y/unknown         value              on      used as right side value
 CUDA           d/macro           condition          off     used in part of #if/#ifdef/#elif conditions
 CUDA           d/macro           undef              on      undefined
 CUDA           h/header          local              on      local header
@@ -254,6 +260,7 @@ Zsh            s/script          loaded             on      loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -293,6 +300,7 @@ s/script   loaded on      loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       off     local header
@@ -304,6 +312,7 @@ m/member   initialized off     initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       off     local header
@@ -316,6 +325,7 @@ m/member   initialized off     initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         on      referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   on      used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -328,6 +338,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         on      referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   on      used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -339,6 +350,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       off     local header
@@ -357,6 +369,7 @@ s/script   loaded    on      loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       off     local header
@@ -376,6 +389,7 @@ s/script   loaded    on      loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         on      referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   on      used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -396,6 +410,7 @@ s/script   loaded    off     loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         on      referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   on      used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -415,6 +430,7 @@ s/script   loaded    off     loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       off     local header
@@ -433,6 +449,7 @@ s/script   loaded    on      loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       off     local header
@@ -452,6 +469,7 @@ s/script   loaded    on      loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       on      local header
@@ -472,6 +490,7 @@ s/script   loaded    off     loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       on      local header
@@ -491,6 +510,7 @@ s/script   loaded    off     loaded
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -502,6 +522,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -513,6 +534,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -524,6 +546,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -535,6 +558,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       off     local header
@@ -546,6 +570,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       off     local header
@@ -558,6 +583,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       on      local header
@@ -570,6 +596,7 @@ m/member   initialized off     initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       on      local header
@@ -581,6 +608,7 @@ m/member   initialized off     initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       off     local header
@@ -592,6 +620,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       on      used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       on      undefined
 h/header   local       on      local header
@@ -603,6 +632,7 @@ m/member   initialized on      initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       on      local header
@@ -614,6 +644,7 @@ m/member   initialized off     initialized with form '.member = ...'
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
 Y/unknown  ref         off     referenced anyhow
+Y/unknown  value       off     used as right side value
 d/macro    condition   off     used in part of #if/#ifdef/#elif conditions
 d/macro    undef       off     undefined
 h/header   local       on      local header

diff --git a/Tmain/nested-subparsers.d/stdout-expected.txt b/Tmain/nested-subparsers.d/stdout-expected.txt
@@ -37,7 +37,7 @@ n  name
 #LETTER NAME       ENABLED REFONLY NROLES MASTER DESCRIPTION
 D       macroparam no      no      0      C      parameters inside macro definitions
 L       label      no      no      0      C      goto labels
-Y       unknown    no      yes     1      C      unknown identifier
+Y       unknown    no      yes     2      C      unknown identifier
 d       macro      yes     no      2      C      macro definitions
 e       enumerator yes     no      0      C      enumerators (values inside an enumeration)
 f       function   yes     no      0      C      function definitions

diff --git a/Units/parser-c.r/c-reftag-member.d/args.ctags b/Units/parser-c.r/c-reftag-member.d/args.ctags
@@ -3,3 +3,4 @@
 --fields=+rKZ
 --kinds-C=*
 --roles-C.{member}=*
+--roles-C.{unknown}=+{value}
diff --git a/Units/parser-c.r/c-reftag-member.d/expected.tags b/Units/parser-c.r/c-reftag-member.d/expected.tags
@@ -1,3 +1,5 @@
 file_ops	input.c	/^static struct ops file_ops = {$/;"	variable	typeref:struct:ops	file:	roles:def
 read	input.c	/^	.read  = file_read_fn,$/;"	member	scope:variable:file_ops	roles:initialized
+file_read_fn	input.c	/^	.read  = file_read_fn,$/;"	unknown	scope:variable:file_ops	roles:value
 write	input.c	/^	.write = file_write_fn,$/;"	member	scope:variable:file_ops	roles:initialized
+file_write_fn	input.c	/^	.write = file_write_fn,$/;"	unknown	scope:variable:file_ops	roles:value
diff --git a/parsers/cxx/cxx_parser_variable.c b/parsers/cxx/cxx_parser_variable.c
@@ -118,6 +118,44 @@ static void cxxParserExtractMembersInitialization(CXXTokenChain * pChain, int iS
 			}
 			// Point t to the assignment.
 			t = t->pNext->pNext->pNext;
+
+			// Looking for the pattern:
+			//
+			//     = unknown,
+			//
+			// or
+			//
+			//     = unknown}
+			//
+			if(t->pNext &&
+			   cxxTokenTypeIs(t->pNext, CXXTokenTypeIdentifier) &&
+			   t->pNext->pNext &&
+			   cxxTokenTypeIsOneOf(t->pNext->pNext,
+								   CXXTokenTypeComma|CXXTokenTypeClosingBracket))
+
+			{
+				CXXToken *pIdentifier = t->pNext;
+				if(pIdentifier->iCorkIndex != CORK_NIL && pIdentifier->bCorkIndexForReftag)
+				{
+					cxxTagResetRefTag(pIdentifier->iCorkIndex, iScopeCorkIndex,
+									  CXXTagKindUNKNOWN, CXXTagUnknownRoleVALUE);
+				}
+				else if(pIdentifier->iCorkIndex == CORK_NIL)
+				{
+					tagEntryInfo oEntry;
+					initRefTagEntry(&oEntry, vStringValue(pIdentifier->pszWord),
+									CXXTagKindUNKNOWN, CXXTagUnknownRoleVALUE);
+					oEntry.lineNumber = pIdentifier->iLineNumber;
+					oEntry.filePosition = pIdentifier->oFilePosition;
+					oEntry.isFileScope = false;
+					// TODO: Other scope field must be filled.
+					oEntry.extensionFields.scopeIndex = iScopeCorkIndex;
+					pIdentifier->iCorkIndex = makeTagEntry(&oEntry);
+					registerEntry(pIdentifier->iCorkIndex);
+					pIdentifier->bCorkIndexForReftag = 1;
+				}
+				t = t->pNext;
+			}
 		}
 	}
 	return;

diff --git a/parsers/cxx/cxx_tag.c b/parsers/cxx/cxx_tag.c
@@ -22,6 +22,7 @@
 #define CXX_COMMON_UNKNOWN_ROLES(__langPrefix) \
 	static roleDefinition __langPrefix##UnknownRoles [] = { \
 		{ false, "ref", "referenced anyhow" }, \
+		{ true,  "value", "used as right side value" }, \
 	}
 
 CXX_COMMON_UNKNOWN_ROLES(C);

diff --git a/parsers/cxx/cxx_tag.h b/parsers/cxx/cxx_tag.h
@@ -43,6 +43,7 @@ enum CXXTagCommonKind
 enum CXXTagUnknownRole
 {
 	CXXTagUnknownRoleREFERENCED,
+	CXXTagUnknownRoleVALUE,
 };
 
 enum CXXTagMemberRole