cgen: minor cleanup (use replace_each) (#6978)

Delta456 · web-flow · commit 2473f65278b4 · 2020-11-27T16:13:30.000+01:00
diff --git a/vlib/v/gen/cgen.v b/vlib/v/gen/cgen.v
@@ -509,8 +509,7 @@ fn (g &Gen) cc_type2(t table.Type) string {
 			}
 			styp += sgtyps
 		} else if styp.contains('<') {
-			// TODO: yuck
-			styp = styp.replace('<', '_T_').replace('>', '').replace(',', '_')
+			styp = styp.replace_each(['<', '_T_', '>', '', ',', '_'])
 		}
 	}
 	return styp
@@ -4512,9 +4511,8 @@ fn (mut g Gen) write_types(types []table.TypeSymbol) {
 				if typ.info.generic_types.len > 0 {
 					continue
 				}
-				// TODO: yuck
 				if name.contains('<') {
-					name = name.replace('<', '_T_').replace('>', '').replace(',', '_')
+					name = name.replace_each(['<', '_T_', '>', '', ',', '_'])
 					g.typedefs.writeln('typedef struct $name $name;')
 				}
 				// TODO avoid buffer manip

Original file line number	Diff line number	Diff line change
`@@ -509,8 +509,7 @@ fn (g &Gen) cc_type2(t table.Type) string {`
`509`	`509`	`}`
`510`	`510`	`styp += sgtyps`
`511`	`511`	`} else if styp.contains('<') {`
`512`		`- // TODO: yuck`
`513`		`- styp = styp.replace('<', '_T_').replace('>', '').replace(',', '_')`
	`512`	`+ styp = styp.replace_each(['<', '_T_', '>', '', ',', '_'])`
`514`	`513`	`}`
`515`	`514`	`}`
`516`	`515`	`return styp`
`@@ -4512,9 +4511,8 @@ fn (mut g Gen) write_types(types []table.TypeSymbol) {`
`4512`	`4511`	`if typ.info.generic_types.len > 0 {`
`4513`	`4512`	`continue`
`4514`	`4513`	`}`
`4515`		`- // TODO: yuck`
`4516`	`4514`	`if name.contains('<') {`
`4517`		`- name = name.replace('<', '_T_').replace('>', '').replace(',', '_')`
	`4515`	`+ name = name.replace_each(['<', '_T_', '>', '', ',', '_'])`
`4518`	`4516`	`g.typedefs.writeln('typedef struct $name $name;')`
`4519`	`4517`	`}`
`4520`	`4518`	`// TODO avoid buffer manip`