for var_line in field_var_lines:
if var_line.group(1) in trait_structs:
field_var_convs.append((var_line.group(1), var_line.group(2), trait_structs[var_line.group(1)]))
- flattened_field_var_convs.append((var_line.group(1), var_line.group(2), ))
- flattened_field_var_convs.extend(trait_structs[var_line.group(1)])
+ flattened_field_var_convs.append((var_line.group(1), var_line.group(2), var_line.group(2)))
+ for field_var in trait_structs[var_line.group(1)]:
+ if isinstance(field_var, ConvInfo):
+ flattened_field_var_convs.append(field_var)
+ else:
+ path = var_line.group(2)
+ if len(field_var) > 2:
+ path = var_line.group(2) + "." + field_var[2]
+ flattened_field_var_convs.append((field_var[0], field_var[1], path))
else:
mapped = type_mapping_generator.map_type(var_line.group(1) + " " + var_line.group(2), False, None, False, False)
field_var_convs.append(mapped)
flattened_field_var_convs.append(mapped)
- trait_structs[struct_name] = field_var_convs
+ trait_structs[struct_name] = flattened_field_var_convs
field_fns = []
for fn_docs, fn_line in trait_fn_lines: