handle exprstmt

Signed-off-by: Iskander Sharipov <[email protected]>

normalizer.go

@@ -158,6 +158,8 @@ func (n *normalizer) normalizeExprList(xs []ast.Expr) []ast.Expr {
 
 func (n *normalizer) normalizeStmt(x ast.Stmt) ast.Stmt {
 	switch x := x.(type) {
+	case *ast.ExprStmt:
+		return n.normalizeExprStmt(x)
 	case *ast.AssignStmt:
 		return n.normalizeAssignStmt(x)
 	case *ast.BlockStmt:
@@ -403,6 +405,11 @@ func (n *normalizer) normalizeValSwap(b *ast.BlockStmt) {
 	}
 }
 
+func (n *normalizer) normalizeExprStmt(stmt *ast.ExprStmt) ast.Stmt {
+	stmt.X = n.normalizeExpr(stmt.X)
+	return stmt
+}
+
 func (n *normalizer) normalizeAssignStmt(assign *ast.AssignStmt) ast.Stmt {
 	for i, lhs := range assign.Lhs {
 		assign.Lhs[i] = n.normalizeExpr(lhs)

testdata/normalize_stmt.go

@@ -1,5 +1,7 @@
 package normalize_stmt
 
+func addInts(x, y int) int { return x + y }
+
 func identityTest() {
 	var x int
 
@@ -260,6 +262,14 @@ func rangeLoopTest() {
 	}
 }
 
+func exprStmtTest() {
+	_, _ = func() {
+		addInts((1), 0+0+0)
+	}, func() {
+		addInts(1, 0)
+	}
+}
+
 func combinedTest() {
 	var x int