From b171463a475c3880cc122e01197287bf405ee4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 9 Jul 2020 16:50:51 +0100
Subject: [PATCH] slightly less verbose runtime AST code

And rewrite a loop to be a bit simpler.
---
 runtime_api.go | 107 ++++++++++++++++++-------------------------------
 strings.go     |   1 -
 2 files changed, 38 insertions(+), 70 deletions(-)

diff --git a/runtime_api.go b/runtime_api.go
index f8a05be..819d15c 100644
--- a/runtime_api.go
+++ b/runtime_api.go
@@ -48,21 +48,18 @@ func addRuntimeAPI(filename string, file *ast.File) {
 		//    the runtime.hex values in a way not consistent with normal panic
 		//    outputs
 		for _, decl := range file.Decls {
-			funcDecl, ok := decl.(*ast.FuncDecl)
-			if ok && funcDecl.Name.Name == "printany" {
-				for _, stmt := range funcDecl.Body.List {
-					switchStmt, ok := stmt.(*ast.TypeSwitchStmt)
-					if !ok {
-						continue
-					}
-
-					switchStmt.Body.List = append(switchStmt.Body.List, printanyHexCase)
+			decl, ok := decl.(*ast.FuncDecl)
+			if !ok || decl.Name.Name != "printany" {
+				continue
+			}
+			for _, stmt := range decl.Body.List {
+				if stmt, ok := stmt.(*ast.TypeSwitchStmt); ok {
+					stmt.Body.List = append(stmt.Body.List, printanyHexCase)
 					break
 				}
-
-				funcDecl.Body.List = append([]ast.Stmt{fatalErrorsHiddenCheckStmt}, funcDecl.Body.List...)
-				break
 			}
+			decl.Body.List = append([]ast.Stmt{fatalErrorsHiddenCheckStmt}, decl.Body.List...)
+			break
 		}
 
 		file.Decls = append(file.Decls, panicprintDecl)
@@ -83,74 +80,48 @@ var fatalErrorsHiddenCheckStmt = &ast.IfStmt{
 var hideFatalErrorsDecls = []ast.Decl{
 	&ast.GenDecl{
 		Tok: token.VAR,
-		Specs: []ast.Spec{
-			&ast.ValueSpec{
-				Names: []*ast.Ident{
-					{Name: "fatalErrorsHidden"},
-				},
-				Type: &ast.Ident{Name: "bool"},
-			},
-		},
+		Specs: []ast.Spec{&ast.ValueSpec{
+			Names: []*ast.Ident{{Name: "fatalErrorsHidden"}},
+			Type:  &ast.Ident{Name: "bool"},
+		}},
 	},
 	&ast.FuncDecl{
 		Name: &ast.Ident{Name: "hideFatalErrors"},
-		Type: &ast.FuncType{
-			Params: &ast.FieldList{
-				List: []*ast.Field{
-					{
-						Names: []*ast.Ident{
-							{Name: "hide"},
-						},
-						Type: &ast.Ident{Name: "bool"},
-					},
-				},
-			},
-		},
-		Body: &ast.BlockStmt{
-			List: []ast.Stmt{
-				&ast.AssignStmt{
-					Lhs: []ast.Expr{
-						&ast.Ident{Name: "fatalErrorsHidden"},
-					},
-					Tok: token.ASSIGN,
-					Rhs: []ast.Expr{
-						&ast.Ident{Name: "hide"},
-					},
-				},
+		Type: &ast.FuncType{Params: &ast.FieldList{
+			List: []*ast.Field{{
+				Names: []*ast.Ident{{Name: "hide"}},
+				Type:  &ast.Ident{Name: "bool"},
+			}},
+		}},
+		Body: &ast.BlockStmt{List: []ast.Stmt{
+			&ast.AssignStmt{
+				Lhs: []ast.Expr{&ast.Ident{Name: "fatalErrorsHidden"}},
+				Tok: token.ASSIGN,
+				Rhs: []ast.Expr{&ast.Ident{Name: "hide"}},
 			},
-		},
+		}},
 	},
 }
 
 var printanyHexCase = &ast.CaseClause{
-	List: []ast.Expr{
-		&ast.Ident{Name: "hex"},
-	},
+	List: []ast.Expr{&ast.Ident{Name: "hex"}},
 	Body: []ast.Stmt{
-		&ast.ExprStmt{
-			X: &ast.CallExpr{
-				Fun: &ast.Ident{Name: "print"},
-				Args: []ast.Expr{
-					&ast.Ident{Name: "v"},
-				},
-			},
-		},
+		&ast.ExprStmt{X: &ast.CallExpr{
+			Fun:  &ast.Ident{Name: "print"},
+			Args: []ast.Expr{&ast.Ident{Name: "v"}},
+		}},
 	},
 }
 
 var panicprintDecl = &ast.FuncDecl{
 	Name: &ast.Ident{Name: "panicprint"},
 	Type: &ast.FuncType{Params: &ast.FieldList{
-		List: []*ast.Field{
-			{
-				Names: []*ast.Ident{
-					{Name: "args"},
-				},
-				Type: &ast.Ellipsis{Elt: &ast.InterfaceType{
-					Methods: &ast.FieldList{},
-				}},
-			},
-		},
+		List: []*ast.Field{{
+			Names: []*ast.Ident{{Name: "args"}},
+			Type: &ast.Ellipsis{Elt: &ast.InterfaceType{
+				Methods: &ast.FieldList{},
+			}},
+		}},
 	}},
 	Body: &ast.BlockStmt{List: []ast.Stmt{
 		&ast.IfStmt{
@@ -166,10 +137,8 @@ var panicprintDecl = &ast.FuncDecl{
 			X:     &ast.Ident{Name: "args"},
 			Body: &ast.BlockStmt{List: []ast.Stmt{
 				&ast.ExprStmt{X: &ast.CallExpr{
-					Fun: &ast.Ident{Name: "printany"},
-					Args: []ast.Expr{
-						&ast.Ident{Name: "arg"},
-					},
+					Fun:  &ast.Ident{Name: "printany"},
+					Args: []ast.Expr{&ast.Ident{Name: "arg"}},
 				}},
 			}},
 		},
diff --git a/strings.go b/strings.go
index e95a02e..bc2e1de 100644
--- a/strings.go
+++ b/strings.go
@@ -317,7 +317,6 @@ func keyStmt(key []byte) *ast.GenDecl {
 }
 
 func constBlacklist(node ast.Node, info *types.Info, blacklist map[types.Object]struct{}) {
-
 	blacklistObjects := func(node ast.Node) bool {
 		ident, ok := node.(*ast.Ident)
 		if !ok {