genbindings/transform: move "With" names outside the proposedName ctr

cmd/genbindings/transformoverload.go

@@ -29,10 +29,8 @@ func astTransformOverloads(parsed *CppParsedHeader) {
 			// Collision - rename
 			anyChange = true
 
-			ctr := 1
+			proposedName = (func() (proposedName string) {
-			for {
 
-				if ctr == 1 {
 				// Fake special-case check
 				// If this is a 1-argument function, try and name it FooFrom{Type}
 				// e.g. NewVariantFromFloat
@@ -47,21 +45,25 @@ func astTransformOverloads(parsed *CppParsedHeader) {
 						proposedName = originalProposal + "With" + titleCase(m.Parameters[0].renderTypeForMethod())
 					}
 					if _, ok := existing[proposedName]; !ok {
-							break
+						return proposedName
 					}
 
 				}
 
-				} else {
+				// No special naming, have to use a numeric overload
+				// Numbers start with 2 since the "original" is the first
+				ctr := 2
+				for {
 					proposedName = fmt.Sprintf("%s%d", originalProposal, ctr)
 					if _, ok := existing[proposedName]; !ok {
-						break
+						return proposedName
-					}
 					}
 
 					ctr++ // Loop until we have a non-colliding name available
 				}
+			})()
 
+			// We have identified a final replacement name
 			existing[proposedName] = struct{}{}
 			m.Rename(proposedName)
 			c.Methods[j] = m