CXX: add "constinit" to "properties:" field

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

Units/parser-cxx.r/properties-constinit.d/args.ctags

@@ -0,0 +1,4 @@
+--sort=no
+--kinds-c++=*-{parameter}
+--fields=+x
+--fields-c++=+{properties}

Units/parser-cxx.r/properties-constinit.d/expected.tags

@@ -0,0 +1,5 @@
+g	input.cc	/^const char *g() { return "dynamic initialization"; }$/;"	f	typeref:typename:const char *
+f	input.cc	/^constexpr const char *f(bool p) { return p ? "constant initializer" : g(); }$/;"	f	typeref:typename:const char *	properties:constexpr
+c	input.cc	/^constinit const char *c = f(true); \/\/ OK$/;"	v	typeref:typename:const char *	properties:constinit
+x	input.cc	/^extern thread_local constinit int x;$/;"	x	typeref:typename:thread_local int	properties:extern,constinit
+f	input.cc	/^int f() { return x; } \/\/ no check of a guard variable needed$/;"	f	typeref:typename:int

Units/parser-cxx.r/properties-constinit.d/input.cc

@@ -0,0 +1,8 @@
+// Taken from https://en.cppreference.com/w/cpp/language/constinit
+const char *g() { return "dynamic initialization"; }
+constexpr const char *f(bool p) { return p ? "constant initializer" : g(); }
+
+constinit const char *c = f(true); // OK
+
+extern thread_local constinit int x;
+int f() { return x; } // no check of a guard variable needed

parsers/cxx/cxx_keyword.c

@@ -222,6 +222,11 @@ static CXXKeywordDescriptor g_aCXXKeywordTable[] = {
 		CXXLanguageCPP,
 		CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames
 	},
+	{
+		"constinit",
+		CXXLanguageCPP,
+		CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames
+	},
 	{
 		"const_cast",
 		CXXLanguageCPP,

parsers/cxx/cxx_keyword.h

@@ -54,6 +54,7 @@ typedef enum _CXXKeyword
 	CXXKeywordCONST,
 	CXXKeywordCONSTEVAL, // (since C++20)
 	CXXKeywordCONSTEXPR, // (since C++11)
+	CXXKeywordCONSTINIT, // (since C++20)
 	CXXKeywordCONST_CAST,
 	CXXKeywordCONTINUE,
 	CXXKeywordDECLTYPE, // (since C++11)

parsers/cxx/cxx_parser_block.c

@@ -643,6 +643,9 @@ static bool cxxParserParseBlockInternal(bool bExpectClosingBracket)
 					case CXXKeywordCONSTEVAL:
 						g_cxx.uKeywordState |= CXXParserKeywordStateSeenConsteval;
 					break;
+					case CXXKeywordCONSTINIT:
+						g_cxx.uKeywordState |= CXXParserKeywordStateSeenConstinit;
+					break;
 					default:
 						if(g_cxx.uKeywordState & CXXParserKeywordStateSeenTypedef)
 						{

parsers/cxx/cxx_parser_function.c

@@ -1734,6 +1734,7 @@ int cxxParserEmitFunctionTags(
 				uProperties |= CXXTagPropertyConstexpr;
 			if(g_cxx.uKeywordState & CXXParserKeywordStateSeenConsteval)
 				uProperties |= CXXTagPropertyConsteval;
+			// constinit is not here; it is for variables.
 			if(pInfo->pSignatureConst)
 				uProperties |= CXXTagPropertyConst;
 			if(pInfo->uFlags & CXXFunctionSignatureInfoPure)

parsers/cxx/cxx_parser_internal.h

@@ -288,6 +288,8 @@ typedef enum _CXXParserKeywordState
 	CXXParserKeywordStateSeenConstexpr = (1 << 13),
 	// "consteval" has been seen
 	CXXParserKeywordStateSeenConsteval = (1 << 14),
+	// "constinit" has been seen
+	CXXParserKeywordStateSeenConstinit = (1 << 15),
 } CXXParserKeywordState;
 
 #define CXX_PARSER_MAXIMUM_NESTING_LEVELS 1024

parsers/cxx/cxx_parser_variable.c

@@ -759,6 +759,8 @@ bool cxxParserExtractVariableDeclarations(CXXTokenChain * pChain,unsigned int uF
 				//	uProperties |= CXXTagPropertyVolatile;
 				if(g_cxx.uKeywordState & CXXParserKeywordStateSeenConstexpr)
 					uProperties |= CXXTagPropertyConstexpr;
+				if(g_cxx.uKeywordState & CXXParserKeywordStateSeenConstinit)
+					uProperties |= CXXTagPropertyConstinit;
 				// consteval is not here; it is for functions.
 
 				pszProperties = cxxTagSetProperties(uProperties);

parsers/cxx/cxx_tag.c

@@ -374,6 +374,8 @@ vString * cxxTagSetProperties(unsigned int uProperties)
 		ADD_PROPERTY("constexpr");
 	if (uProperties & CXXTagPropertyConsteval)
 		ADD_PROPERTY("consteval");
+	if (uProperties & CXXTagPropertyConstinit)
+		ADD_PROPERTY("constinit");
 
 	cxxTagSetField(CXXTagFieldProperties,vStringValue(pszProperties),false);