Go: fill typeref field of tparam kind tags

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Author: masatake

Units/parser-go.r/go-generics.d/expected.tags

@@ -1,7 +1,7 @@
-T	input.go	/^func min[T ~int|~float64](x, y T) T {$/;"	Z	func:min	nth:0
+T	input.go	/^func min[T ~int|~float64](x, y T) T {$/;"	Z	func:min	typeref:constrain:~int|~float64	nth:0
 min	input.go	/^func min[T ~int|~float64](x, y T) T {$/;"	f	typeref:typename:T	signature:(x, y T)	tparams:[T ~int|~float64]
-S1	input.go	/^func EqualFunc[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool {$/;"	Z	func:EqualFunc	nth:0
-S2	input.go	/^func EqualFunc[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool {$/;"	Z	func:EqualFunc	nth:1
-E1	input.go	/^func EqualFunc[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool {$/;"	Z	func:EqualFunc	nth:2
-E2	input.go	/^func EqualFunc[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool {$/;"	Z	func:EqualFunc	nth:3
+S1	input.go	/^func EqualFunc[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool {$/;"	Z	func:EqualFunc	typeref:constrain:~[]E1	nth:0
+S2	input.go	/^func EqualFunc[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool {$/;"	Z	func:EqualFunc	typeref:constrain:~[]E2	nth:1
+E1	input.go	/^func EqualFunc[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool {$/;"	Z	func:EqualFunc	typeref:constrain:any	nth:2
+E2	input.go	/^func EqualFunc[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool {$/;"	Z	func:EqualFunc	typeref:constrain:any	nth:3
 EqualFunc	input.go	/^func EqualFunc[S1 ~[]E1, S2 ~[]E2, E1, E2 any](s1 S1, s2 S2, eq func(E1, E2) bool) bool {$/;"	f	typeref:typename:bool	signature:(s1 S1, s2 S2, eq func(E1, E2) bool)	tparams:[S1 ~[]E1, S2 ~[]E2, E1, E2 any]

parsers/go.c

@@ -801,7 +801,29 @@ static tokenInfo * parseReceiver (tokenInfo *const token, int *corkIndex)
 	return receiver_type_token;
 }
 
-static intArray * parseTypeParameters (tokenInfo *const token, collector *collector)
+static void attachConstrain (intArray *tparams_indexes, collector *constrain)
+{
+	collectorTruncate (constrain, false);
+	if (collectorIsEmpty (constrain))
+		return;
+
+	const char *constrain_cstr = vStringValue (constrain->str);
+	for (unsigned int i = intArrayCount (tparams_indexes); i > 0; i--)
+	{
+		int index = intArrayItem (tparams_indexes, i - 1);
+		tagEntryInfo *e = getEntryInCorkQueue (index);
+		if (!e)
+			continue;			/* Maybe "_" */
+
+		if (e->extensionFields.typeRef [0])
+			return;
+
+		e->extensionFields.typeRef [0] = eStrdup ("constrain");
+		e->extensionFields.typeRef [1] = eStrdup (constrain_cstr);
+	}
+}
+
+static intArray * parseTypeParameters (tokenInfo *const token, collector *tparams)
 {
 	// TypeParameters = "[" TypeParamList [ "," ] "]" .
 	// TypeParamList  = TypeParamDecl { "," TypeParamDecl } .
@@ -811,40 +833,63 @@ static intArray * parseTypeParameters (tokenInfo *const token, collector *collec
 
 	int nest_level = 1;
 	bool expecting_param = true;
-	intArray *tparams = intArrayNew ();
+	intArray *tparams_indexes = intArrayNew ();
+	bool expecting_constrain = false;
+
+	vString *buffer = vStringNew ();
+	collector constrain = COLLECTOR (buffer);
 
 	while (nest_level > 0 && !isType (token, TOKEN_EOF))
 	{
-		readTokenFull (token, collector);
+		readTokenFull (token, tparams);
 		if (isType (token, TOKEN_OPEN_PAREN)
 			|| isType (token, TOKEN_OPEN_CURLY)
 			|| isType (token, TOKEN_OPEN_SQUARE))
+		{
 			nest_level++;
+			collectorAppendToken (&constrain, token);
+		}
 		else if (isType (token, TOKEN_CLOSE_PAREN)
 				 || isType (token, TOKEN_CLOSE_CURLY)
 				 || isType (token, TOKEN_CLOSE_SQUARE))
+		{
 			nest_level--;
+			if (nest_level == 0)
+			{
+				attachConstrain (tparams_indexes, &constrain);
+				collectorReset(&constrain);
+				continue;
+			}
+			collectorAppendToken (&constrain, token);
+		}
 		else if (nest_level == 1
 				 && isType (token, TOKEN_IDENTIFIER)
 				 && expecting_param)
 		{
+			attachConstrain (tparams_indexes, &constrain);
+			collectorReset(&constrain);
+
 			expecting_param = false;
+			expecting_constrain = true;
 			int index = makeTag (token, GOTAG_TPARAM, CORK_NIL, NULL, NULL);
-			intArrayAdd (tparams, index);
+			intArrayAdd (tparams_indexes, index);
 		}
 		else if (nest_level == 1
 				 && isType (token, TOKEN_COMMA))
 		{
-			/* TODO: put the tokens to typeref:constrain:... of the
-			 * tparam tag */
 			expecting_param = true;
+			expecting_constrain = false;
 		}
+		else if (expecting_constrain)
+			collectorAppendToken(&constrain, token);
 	}
 
+	vStringDelete (buffer);
+
 	/* Read the next token as the other parser* functions do.
 	 * However, don't put the token to the collector. */
 	readToken (token);
-	return tparams;
+	return tparams_indexes;
 }
 
 static void parseFunctionOrMethod (tokenInfo *const token, const int scope)