vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cgen: optimize generic struct name replacement (temp solution)

pull/5580/head
joe-conigliaro 2020-06-30 13:45:52 +10:00
parent 73da3c9e4c
commit a3086a2ef3
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vlib/v/gen/cgen.v
View File

@ -394,22 +394,21 @@ fn (g &Gen) cc_type(t table.Type) string {
sym := g.table.get_type_symbol(g.unwrap_generic(t)) sym := g.table.get_type_symbol(g.unwrap_generic(t))
mut styp := sym.name.replace('.', '__') mut styp := sym.name.replace('.', '__')
if sym.kind == .struct_ { if sym.kind == .struct_ {
// TODO: maybe keep c name in info ( this is yuck )
info := sym.info as table.Struct info := sym.info as table.Struct
if info.generic_types.len > 0 { if info.generic_types.len > 0 {
mut sgts := '_T' mut sgtyps := '_T'
for gt in info.generic_types { for gt in info.generic_types {
gts := g.table.get_type_symbol(if gt.has_flag(.generic) { gts := g.table.get_type_symbol(if gt.has_flag(.generic) {
g.unwrap_generic(gt) g.unwrap_generic(gt)
} else { } else {
gt gt
}) })
sgts += '_$gts.name' sgtyps += '_$gts.name'
} }
styp += sgts styp += sgtyps
} }
else { else if styp.contains('<') {
// TODO: maybe keep c name in info ( this is yuck ) // TODO: yuck
styp = styp.replace('<', '_T_').replace('>', '').replace(',', '_') styp = styp.replace('<', '_T_').replace('>', '').replace(',', '_')
} }
} }
@ -2842,9 +2841,9 @@ fn (mut g Gen) write_types(types []table.TypeSymbol) {
if info.generic_types.len > 0 { if info.generic_types.len > 0 {
continue continue
} }
// TODO: maybe keep c name in info ( this is yuck ) // TODO: yuck
name = name.replace('<', '_T_').replace('>', '').replace(',', '_') if name.contains('<') {
if name.contains('_T_') { name = name.replace('<', '_T_').replace('>', '').replace(',', '_')
g.typedefs.writeln('typedef struct $name $name;') g.typedefs.writeln('typedef struct $name $name;')
} }
// TODO avoid buffer manip // TODO avoid buffer manip