From 378d3e44034e817093966ea42c2940d6a0482dd8 Mon Sep 17 00:00:00 2001 From: Jimmi Holst Christensen Date: Mon, 15 Oct 2018 09:51:15 -0400 Subject: Solve the return type ambiguity (#1628) Changed container and initializer syntax * { ... } -> . { ... } * { ... } -> . { ...} --- src/ir.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ir.cpp') diff --git a/src/ir.cpp b/src/ir.cpp index c48b56255d..fee6eb7f4a 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -6336,7 +6336,7 @@ static ZigType *get_error_set_union(CodeGen *g, ErrorTableEntry **errors, ZigTyp ZigType *err_set_type = new_type_table_entry(ZigTypeIdErrorSet); buf_resize(&err_set_type->name, 0); - buf_appendf(&err_set_type->name, "error{"); + buf_appendf(&err_set_type->name, "error.{"); for (uint32_t i = 0, count = set1->data.error_set.err_count; i < count; i += 1) { assert(errors[set1->data.error_set.errors[i]->value] == set1->data.error_set.errors[i]); @@ -6388,7 +6388,7 @@ static ZigType *make_err_set_with_one_item(CodeGen *g, Scope *parent_scope, AstN { ZigType *err_set_type = new_type_table_entry(ZigTypeIdErrorSet); buf_resize(&err_set_type->name, 0); - buf_appendf(&err_set_type->name, "error{%s}", buf_ptr(&err_entry->name)); + buf_appendf(&err_set_type->name, "error.{%s}", buf_ptr(&err_entry->name)); err_set_type->is_copyable = true; err_set_type->type_ref = g->builtin_types.entry_global_error_set->type_ref; err_set_type->di_type = g->builtin_types.entry_global_error_set->di_type; @@ -8244,7 +8244,7 @@ static ZigType *get_error_set_intersection(IrAnalyze *ira, ZigType *set1, ZigTyp ZigType *err_set_type = new_type_table_entry(ZigTypeIdErrorSet); buf_resize(&err_set_type->name, 0); - buf_appendf(&err_set_type->name, "error{"); + buf_appendf(&err_set_type->name, "error.{"); for (uint32_t i = 0; i < set2->data.error_set.err_count; i += 1) { ErrorTableEntry *error_entry = set2->data.error_set.errors[i]; -- cgit v1.2.3