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

struct opt file_ops { .read = file_read, .write = file_write, }; The parser with this change extracts "opt" with "defvar" role of "unknown" kind. Signed-off-by: Masatake YAMATO <[email protected]>
universal-ctags · Dec 3, 2022 · e47cb40 · e47cb40
1 parent 27fc421
commit e47cb40
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 15 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	2	C	unknown identifier
+Y	unknown	no	yes	3	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	2	C	unknown identifier
+Y	unknown	no	yes	3	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
@@ -18,13 +18,15 @@ Automake       d/directory       program            on      directory for PROGRA
 Automake       d/directory       script             on      directory for SCRIPTS primary
 Basic          f/function        decl               on      declared
 Bats           S/script          loaded             on      script loaed with "load" command
+C              Y/unknown         defvar             on      (maybe type) used for defining variables
 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         defvar             on      (maybe type) used for defining variables
 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
@@ -36,6 +38,7 @@ CPreProcessor  d/macro           condition          off     used in part of #if/
 CPreProcessor  d/macro           undef              on      undefined
 CPreProcessor  h/header          local              on      local header
 CPreProcessor  h/header          system             on      system header
+CUDA           Y/unknown         defvar             on      (maybe type) used for defining variables
 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
@@ -146,13 +149,15 @@ Automake       d/directory       program            on      directory for PROGRA
 Automake       d/directory       script             on      directory for SCRIPTS primary
 Basic          f/function        decl               on      declared
 Bats           S/script          loaded             on      script loaed with "load" command
+C              Y/unknown         defvar             on      (maybe type) used for defining variables
 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         defvar             on      (maybe type) used for defining variables
 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
@@ -164,6 +169,7 @@ CPreProcessor  d/macro           condition          off     used in part of #if/
 CPreProcessor  d/macro           undef              on      undefined
 CPreProcessor  h/header          local              on      local header
 CPreProcessor  h/header          system             on      system header
+CUDA           Y/unknown         defvar             on      (maybe type) used for defining variables
 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
@@ -259,6 +265,7 @@ Zsh            s/script          loaded             on      loaded
 # C.*
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -299,6 +306,7 @@ s/script   loaded on      loaded
 # C.* with disabling all roles of all languages
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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
@@ -311,6 +319,7 @@ m/member   initialized off     initialized with form '.member = ...'
 # C.* with disabling all roles of all kinds of all languages
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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
@@ -324,6 +333,7 @@ m/member   initialized off     initialized with form '.member = ...'
 # after disabling system role of header kind of C language
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -337,6 +347,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # after disabling system role of header kind of C language
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -349,6 +360,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # C.* with disabling all roles in C language
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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
@@ -368,6 +380,7 @@ s/script   loaded    on      loaded
 # C.* with disabling all roles of all kinds in C language
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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
@@ -388,6 +401,7 @@ s/script   loaded    on      loaded
 # after disabling all roles in all languages
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -409,6 +423,7 @@ s/script   loaded    off     loaded
 # after disabling all roles in all languages
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -429,6 +444,7 @@ s/script   loaded    off     loaded
 # C.* with disabling all roles of {header} kind in C language
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -448,6 +464,7 @@ s/script   loaded    on      loaded
 # C.* with disabling all roles of h kind in C language
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -468,6 +485,7 @@ s/script   loaded    on      loaded
 # after disabling all roles in all languages
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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
@@ -489,6 +507,7 @@ s/script   loaded    off     loaded
 # after disabling all roles in all languages
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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
@@ -509,6 +528,7 @@ s/script   loaded    off     loaded
 # C.* with disabling system role of h kind
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -521,6 +541,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # C.* with disabling system role of {header} kind
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -533,6 +554,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # C.* with enabling system role of h kind after disabling the role
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -545,6 +567,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # C.* with enabling system role of {header} kind after disabling the role
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -557,6 +580,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # C.* with disabling system and local roles of h kind
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -569,6 +593,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # C.* with disabling system and local roles of {header} kind
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -582,6 +607,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # after disabling all roles in all languages
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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
@@ -595,6 +621,7 @@ m/member   initialized off     initialized with form '.member = ...'
 # after disabling all roles in all languages
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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
@@ -607,6 +634,7 @@ m/member   initialized off     initialized with form '.member = ...'
 # C.* with disabling local role of h kind and undef role of d kind
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -619,6 +647,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # C.* with enabling all roles of header kinds after disabling all roles of the kind
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      on      (maybe type) used for defining variables
 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
@@ -631,6 +660,7 @@ m/member   initialized on      initialized with form '.member = ...'
 # C.* with enabling all roles of header kinds after disabling all roles of the kinds of C language
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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
@@ -643,6 +673,7 @@ m/member   initialized off     initialized with form '.member = ...'
 # C.* with enabling all roles of header kinds after disabling all roles of the kinds of C language (short notation)
 #
 #KIND(L/N) NAME        ENABLED DESCRIPTION
+Y/unknown  defvar      off     (maybe type) used for defining variables
 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

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     2      C      unknown identifier
+Y       unknown    no      yes     3      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,4 +3,4 @@
 --fields=+rKZ
 --kinds-C=*
 --roles-C.{member}=*
---roles-C.{unknown}=+{value}
+--roles-C.{unknown}=+{value}{defvar}
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,4 @@
+ops	input.c	/^static struct ops file_ops = {$/;"	unknown	roles:defvar
 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

diff --git a/parsers/cxx/cxx_parser.c b/parsers/cxx/cxx_parser.c
@@ -873,7 +873,7 @@ bool cxxParserParseEnum(void)
 		if(pTypeEnd)
 		{
 			CXX_DEBUG_ASSERT(pTypeBegin,"Type begin should be also set here");
-			pTypeName = cxxTagCheckAndSetTypeField(pTypeBegin,pTypeEnd);
+			pTypeName = cxxTagCheckAndSetTypeField(pTypeBegin,pTypeEnd, false);
 		}
 
 		if(bIsScopedEnum)

diff --git a/parsers/cxx/cxx_parser_function.c b/parsers/cxx/cxx_parser_function.c
@@ -1654,7 +1654,7 @@ int cxxParserEmitFunctionTags(
 					CXXToken * pTokenBeforeParenthesis = pInfo->pParenthesis->pPrev;
 					cxxTokenChainTake(pInfo->pParenthesisContainerChain,pInfo->pParenthesis);
 
-					pTypeName = cxxTagCheckAndSetTypeField(pInfo->pTypeStart,pInfo->pTypeEnd);
+					pTypeName = cxxTagCheckAndSetTypeField(pInfo->pTypeStart,pInfo->pTypeEnd, false);
 
 					cxxTokenChainInsertAfter(
 							pInfo->pParenthesisContainerChain,
@@ -1665,7 +1665,7 @@ int cxxParserEmitFunctionTags(
 					pTypeName = NULL;
 				}
 			} else {
-				pTypeName = cxxTagCheckAndSetTypeField(pInfo->pTypeStart,pInfo->pTypeEnd);
+				pTypeName = cxxTagCheckAndSetTypeField(pInfo->pTypeStart,pInfo->pTypeEnd, false);
 			}
 		} else {
 			pTypeName = NULL;
@@ -1918,7 +1918,8 @@ void cxxParserEmitFunctionParameterTags(CXXTypedVariableSet * pInfo)
 
 				pTypeName = cxxTagCheckAndSetTypeField(
 						pTypeStart,
-						pTypeEnd
+						pTypeEnd,
+						false
 					);
 			} else {
 				// The declaration contains only the identifier!

diff --git a/parsers/cxx/cxx_parser_lambda.c b/parsers/cxx/cxx_parser_lambda.c
@@ -239,7 +239,7 @@ bool cxxParserHandleLambda(CXXToken * pParenthesis)
 		markTagExtraBit (tag, XTAG_ANONYMOUS);
 
 		if(pTypeStart)
-			pTypeName = cxxTagCheckAndSetTypeField(pTypeStart,pTypeEnd);
+			pTypeName = cxxTagCheckAndSetTypeField(pTypeStart,pTypeEnd, false);
 		else
 			pTypeName = NULL;
 

diff --git a/parsers/cxx/cxx_parser_template.c b/parsers/cxx/cxx_parser_template.c
@@ -825,7 +825,8 @@ void cxxParserEmitTemplateParameterTags(void)
 
 		CXXToken * pTypeToken = cxxTagCheckAndSetTypeField(
 				g_cxx.oTemplateParameters.aTypeStarts[i],
-				g_cxx.oTemplateParameters.aTypeEnds[i]
+				g_cxx.oTemplateParameters.aTypeEnds[i],
+				false
 			);
 
 		cxxTagCommit(NULL);

diff --git a/parsers/cxx/cxx_parser_typedef.c b/parsers/cxx/cxx_parser_typedef.c
@@ -433,7 +433,8 @@ void cxxParserExtractTypedef(
 
 				pTypeName = cxxTagCheckAndSetTypeField(
 							cxxTokenChainFirst(pChain),
-							pComma ? pComma->pPrev : cxxTokenChainLast(pChain)
+							pComma ? pComma->pPrev : cxxTokenChainLast(pChain),
+							false
 						);
 			}
 

diff --git a/parsers/cxx/cxx_parser_variable.c b/parsers/cxx/cxx_parser_variable.c
@@ -815,7 +815,7 @@ bool cxxParserExtractVariableDeclarations(CXXTokenChain * pChain,unsigned int uF
 			}
 
 			// anything that remains is part of type
-			CXXToken * pTypeToken = cxxTagCheckAndSetTypeField(cxxTokenChainFirst(pChain),t->pPrev);
+			CXXToken * pTypeToken = cxxTagCheckAndSetTypeField(cxxTokenChainFirst(pChain),t->pPrev, true);
 
 			tag->isFileScope = bKnRStyleParameters ?
 					true :