Go: consider TypeArgs

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

Author: masatake

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

@@ -13,9 +13,14 @@ F0	input.go	/^func F0[L ~[]M, M comparable, _, G any](s L, v M) int {$/;"	f	pack
 N	input.go	/^func F1[N ~[]O, O comparable, _ any](s N, v O) int {$/;"	Z	func:x.F1	typeref:constraint:~[]O	nth:0
 O	input.go	/^func F1[N ~[]O, O comparable, _ any](s N, v O) int {$/;"	Z	func:x.F1	typeref:constraint:comparable	nth:1
 F1	input.go	/^func F1[N ~[]O, O comparable, _ any](s N, v O) int {$/;"	f	package:x	typeref:typename:int	signature:(s N, v O)	tparams:[N ~[]O, O comparable, _ any]
+E	input.go	/^type Set[E comparable] struct {$/;"	Z	struct:x.Set	typeref:constraint:comparable	nth:0
+Set	input.go	/^type Set[E comparable] struct {$/;"	s	package:x	tparams:[E comparable]
+m	input.go	/^	m map[E]struct{}$/;"	m	struct:x.Set	typeref:typename:map[E]struct{}
+E	input.go	/^func New[E comparable]() *Set[E] {$/;"	Z	func:x.New	typeref:constraint:comparable	nth:0
+New	input.go	/^func New[E comparable]() *Set[E] {$/;"	f	package:x	typeref:typename:*Set[E]	signature:()	tparams:[E comparable]
 T	input.go	/^type List[T any] struct {$/;"	Z	struct:x.List	typeref:constraint:any	nth:0
 List	input.go	/^type List[T any] struct {$/;"	s	package:x	tparams:[T any]
-next	input.go	/^	next  *List[T]$/;"	m	struct:x.List	typeref:typename:*List
+next	input.go	/^	next  *List[T]$/;"	m	struct:x.List	typeref:typename:*List[T]
 value	input.go	/^	value T$/;"	m	struct:x.List	typeref:typename:T
 X	input.go	/^type List2[X any] = []X$/;"	Z	talias:x.List2	typeref:constraint:any	nth:0
 List2	input.go	/^type List2[X any] = []X$/;"	a	package:x	typeref:typename:[]X	tparams:[X any]

Units/parser-go.r/go-generics.d/input.go

@@ -31,6 +31,17 @@ func F1[N ~[]O, O comparable, _ any](s N, v O) int {
     return -1
 }
 
+// podman/vendor/github.com/containers/image/v5/internal/set/set.go
+type Set[E comparable] struct {
+	m map[E]struct{}
+}
+
+func New[E comparable]() *Set[E] {
+	return &Set[E]{
+		m: map[E]struct{}{},
+	}
+}
+
 // Taken from https://go.dev/ref/spec#Type_definitions
 type List[T any] struct {
 	next  *List[T]

parsers/go.c

@@ -655,7 +655,7 @@ static void skipToMatched (tokenInfo *const token, collector *collector)
 
 static bool skipType (tokenInfo *const token, collector *collector)
 {
-	// Type      = TypeName | TypeLit | "(" Type ")" .
+	// Type      = TypeName [ TypeArgs ] | TypeLit | "(" Type ")" .
 	// Skips also function multiple return values "(" Type {"," Type} ")"
 	if (isType (token, TOKEN_OPEN_PAREN))
 	{
@@ -675,6 +675,8 @@ static bool skipType (tokenInfo *const token, collector *collector)
 			if (isType (token, TOKEN_IDENTIFIER))
 				readTokenFull (token, collector);
 		}
+		else if (isType (token, TOKEN_OPEN_SQUARE))
+			skipToMatched (token, collector);
 		return true;
 	}