From fa2e718bd1ce25d26504903b6dc8aa7f07603c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 19 Feb 2025 22:25:04 +0000
Subject: [PATCH] start using go/ast.Preorder

Thanks to being able to use range-over-func, some control flow
in our code gets simplified.
---
 internal/literals/literals.go |  5 ++---
 position.go                   |  5 ++---
 reverse.go                    |  6 ++----
 runtime_patch.go              | 11 ++++-------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/internal/literals/literals.go b/internal/literals/literals.go
index 4ca275d..a373c55 100644
--- a/internal/literals/literals.go
+++ b/internal/literals/literals.go
@@ -175,7 +175,7 @@ func handleCompositeLiteral(obfRand *obfRand, isPointer bool, node *ast.Composit
 //
 // We don't set any "end" or middle positions, because they seem irrelevant.
 func withPos(node ast.Node, pos token.Pos) ast.Node {
-	ast.Inspect(node, func(node ast.Node) bool {
+	for node := range ast.Preorder(node) {
 		switch node := node.(type) {
 		case *ast.BasicLit:
 			node.ValuePos = pos
@@ -207,8 +207,7 @@ func withPos(node ast.Node, pos token.Pos) ast.Node {
 		case *ast.BranchStmt:
 			node.TokPos = pos
 		}
-		return true
-	})
+	}
 	return node
 }
 
diff --git a/position.go b/position.go
index beadd01..296fb0e 100644
--- a/position.go
+++ b/position.go
@@ -71,7 +71,7 @@ func printFile(lpkg *listedPackage, file *ast.File) ([]byte, error) {
 	// we use a list of offsets indexed by identifiers in source order.
 	var origCallOffsets []int
 	nextOffset := -1
-	ast.Inspect(file, func(node ast.Node) bool {
+	for node := range ast.Preorder(file) {
 		switch node := node.(type) {
 		case *ast.CallExpr:
 			nextOffset = fsetFile.Position(node.Pos()).Offset
@@ -79,8 +79,7 @@ func printFile(lpkg *listedPackage, file *ast.File) ([]byte, error) {
 			origCallOffsets = append(origCallOffsets, nextOffset)
 			nextOffset = -1
 		}
-		return true
-	})
+	}
 
 	copied := 0
 	printBuf2.Reset()
diff --git a/reverse.go b/reverse.go
index 85926f2..cf7cf47 100644
--- a/reverse.go
+++ b/reverse.go
@@ -80,7 +80,7 @@ One can reverse a captured panic stack trace as follows:
 		fieldToStruct := computeFieldToStruct(info)
 		for i, file := range files {
 			goFile := lpkg.CompiledGoFiles[i]
-			ast.Inspect(file, func(node ast.Node) bool {
+			for node := range ast.Preorder(file) {
 				switch node := node.(type) {
 
 				// Replace names.
@@ -125,9 +125,7 @@ One can reverse a captured panic stack trace as follows:
 						fmt.Sprintf("%s/%s", lpkg.ImportPath, goFile),
 					)
 				}
-
-				return true
-			})
+			}
 		}
 	}
 	repl := strings.NewReplacer(replaces...)
diff --git a/runtime_patch.go b/runtime_patch.go
index df240f7..848c0de 100644
--- a/runtime_patch.go
+++ b/runtime_patch.go
@@ -201,16 +201,13 @@ func stripRuntime(basename string, file *ast.File) {
 			}
 		case "runtime1.go":
 			usesEnv := func(node ast.Node) bool {
-				seen := false
-				ast.Inspect(node, func(node ast.Node) bool {
+				for node := range ast.Preorder(node) {
 					ident, ok := node.(*ast.Ident)
 					if ok && ident.Name == "gogetenv" {
-						seen = true
-						return false
+						return true
 					}
-					return true
-				})
-				return seen
+				}
+				return false
 			}
 		filenames:
 			switch funcDecl.Name.Name {