prog: rework foreachArg

Make Foreach* callback accept the arg and a context struct
that can contain lots of aux info.
This (1) removes lots of unuser base/parent args,
(2) provides foundation for stopping recursion,
(3) allows to merge foreachSubargOffset.

1 files changed, 15 insertions, 11 deletions

diff --git a/prog/size.go b/prog/size.go
index 67f7ef754..9f2258c82 100644
--- a/prog/size.go
+++ b/prog/size.go
@@ -94,19 +94,23 @@ func (target *Target) assignSizes(args []Arg, parentsMap map[Arg]Arg) {
 
 func (target *Target) assignSizesArray(args []Arg) {
 	parentsMap := make(map[Arg]Arg)
-	foreachArgArray(&args, nil, func(arg, base Arg, _ *[]Arg) {
-		if _, ok := arg.Type().(*StructType); ok {
-			for _, field := range arg.(*GroupArg).Inner {
-				parentsMap[InnerArg(field)] = arg
+	for _, arg := range args {
+		ForeachSubArg(arg, func(arg Arg, _ *ArgCtx) {
+			if _, ok := arg.Type().(*StructType); ok {
+				for _, field := range arg.(*GroupArg).Inner {
+					parentsMap[InnerArg(field)] = arg
+				}
 			}
-		}
-	})
+		})
+	}
 	target.assignSizes(args, parentsMap)
-	foreachArgArray(&args, nil, func(arg, base Arg, _ *[]Arg) {
-		if _, ok := arg.Type().(*StructType); ok {
-			target.assignSizes(arg.(*GroupArg).Inner, parentsMap)
-		}
-	})
+	for _, arg := range args {
+		ForeachSubArg(arg, func(arg Arg, _ *ArgCtx) {
+			if _, ok := arg.Type().(*StructType); ok {
+				target.assignSizes(arg.(*GroupArg).Inner, parentsMap)
+			}
+		})
+	}
 }
 
 func (target *Target) assignSizesCall(c *Call) {