handle IndexListExpr node (#31)

.github/workflows/go.yml

@@ -8,9 +8,9 @@
       "runs-on": "ubuntu-latest",
       steps: [
         {
-          name: "Set up Go 1.17",
+          name: "Set up Go 1.18",
           uses: "actions/setup-go@v1",
-          "with": {"go-version": 1.17},
+          "with": {"go-version": 1.18},
           id: "go",
         },
         {name: "Check out code into the Go module directory", uses: "actions/checkout@v1"},

compile.go

@@ -365,6 +365,8 @@ func (c *compiler) compileExpr(n ast.Expr) {
 		c.compileBinaryExpr(n)
 	case *ast.IndexExpr:
 		c.compileIndexExpr(n)
+	case *typeparams.IndexListExpr:
+		c.compileIndexListExpr(n)
 	case *ast.Ident:
 		c.compileIdent(n)
 	case *ast.CallExpr:
@@ -452,6 +454,15 @@ func (c *compiler) compileIndexExpr(n *ast.IndexExpr) {
 	c.compileExpr(n.Index)
 }
 
+func (c *compiler) compileIndexListExpr(n *typeparams.IndexListExpr) {
+	c.emitInstOp(opIndexListExpr)
+	c.compileExpr(n.X)
+	for _, x := range n.Indices {
+		c.compileExpr(x)
+	}
+	c.emitInstOp(opEnd)
+}
+
 func (c *compiler) compileWildIdent(n *ast.Ident, optional bool) {
 	info := decodeWildName(n.Name)
 	var inst instruction

compile_test.go

@@ -675,6 +675,14 @@ func TestCompileWithTypes(t *testing.T) {
 			` • BasicLit 0`,
 		},
 
+		`x[int, uint]`: {
+			`IndexListExpr`,
+			` • Ident x`,
+			` • Ident int`,
+			` • Ident uint`,
+			` • End`,
+		},
+
 		`s[:]`: {
 			`SliceExpr`,
 			` • Ident s`,

gen_operations.go

@@ -42,6 +42,8 @@ var opPrototypes = []operationProto{
 
 	{name: "IndexExpr", tag: "IndexExpr", args: "x expr"},
 
+	{name: "IndexListExpr", tag: "IndexListExpr", args: "x exprs..."},
+
 	{name: "SliceExpr", tag: "SliceExpr", args: "x"},
 	{name: "SliceFromExpr", tag: "SliceExpr", args: "x from", example: "x[from:]"},
 	{name: "SliceToExpr", tag: "SliceExpr", args: "x to", example: "x[:to]"},

go.mod

@@ -3,7 +3,7 @@ module github.com/quasilyte/gogrep
 go 1.16
 
 require (
-	github.com/go-toolsmith/astequal v1.0.2
+	github.com/go-toolsmith/astequal v1.0.3
 	github.com/google/go-cmp v0.5.8
 	golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171
 )

go.sum

@@ -1,5 +1,7 @@
 github.com/go-toolsmith/astequal v1.0.2 h1:+XvaV8zNxua+9+Oa4AHmgmpo4RYAbwr/qjNppLfX2yM=
 github.com/go-toolsmith/astequal v1.0.2/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4=
+github.com/go-toolsmith/astequal v1.0.3 h1:+LVdyRatFS+XO78SGV4I3TCEA0AC7fKEGma+fH+674o=
+github.com/go-toolsmith/astequal v1.0.3/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4=
 github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4=
 github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=

match.go

@@ -287,6 +287,10 @@ func (m *matcher) matchNodeWithInst(state *MatcherState, inst instruction, n ast
 		n, ok := n.(*ast.IndexExpr)
 		return ok && m.matchNode(state, n.X) && m.matchNode(state, n.Index)
 
+	case opIndexListExpr:
+		n, ok := n.(*typeparams.IndexListExpr)
+		return ok && m.matchNode(state, n.X) && m.matchExprSlice(state, n.Indices)
+
 	case opKeyValueExpr:
 		n, ok := n.(*ast.KeyValueExpr)
 		return ok && m.matchNode(state, n.Key) && m.matchNode(state, n.Value)

match_test.go

@@ -1316,6 +1316,10 @@ func TestMatch(t *testing.T) {
 			{`$_[$t]($*_)`, 1, `f[int](10)`},
 			{`$_[$t]($*_)`, 0, `f(10)`},
 			{`$_[$t]($*_)`, 0, `f(10, 20)`},
+			{`$_[$t, int]($*_)`, 0, `f(10, 20)`},
+			{`$_[$t, int]($*_)`, 1, `f[int, int](10, 20)`},
+			{`$_[$t, $t]($*_)`, 1, `f[int, int](10, 20)`},
+			{`$_[$t, $t]($*_)`, 0, `f[int, uint](10, 20)`},
 		}...)
 	}
 

nodetag/nodetag.go

@@ -2,6 +2,8 @@ package nodetag
 
 import (
 	"go/ast"
+
+	"golang.org/x/exp/typeparams"
 )
 
 type Value int
@@ -37,6 +39,7 @@ const (
 	ImportSpec
 	IncDecStmt
 	IndexExpr
+	IndexListExpr
 	InterfaceType
 	KeyValueExpr
 	LabeledStmt
@@ -126,6 +129,8 @@ func FromNode(n ast.Node) Value {
 		return IncDecStmt
 	case *ast.IndexExpr:
 		return IndexExpr
+	case *typeparams.IndexListExpr:
+		return IndexListExpr
 	case *ast.InterfaceType:
 		return InterfaceType
 	case *ast.KeyValueExpr:
@@ -236,6 +241,8 @@ func FromString(s string) Value {
 		return IncDecStmt
 	case "IndexExpr":
 		return IndexExpr
+	case "IndexListExpr":
+		return IndexListExpr
 	case "InterfaceType":
 		return InterfaceType
 	case "KeyValueExpr":