mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-03 11:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore missing default values for struct literals at the end

Browse Source
This commit is contained in:
Ginger Bill
2017-07-18 15:32:34 +01:00
parent 277ef1a68f
commit a459364de3
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/check_expr.cpp
View File

@@ -7220,6 +7220,21 @@ ExprKind check_expr_base_internal(Checker *c, Operand *o, AstNode *node, Type *t
{ // Checker values
isize field_count = t->Record.field_count;
isize min_field_count = t->Record.field_count;
for (isize i = min_field_count-1; i >= 0; i--) {
Entity *e = t->Record.fields_in_src_order[i];
GB_ASSERT(e->kind == Entity_Variable);
if (e->Variable.default_is_nil) {
min_field_count--;
} else if (e->Variable.default_is_undef) {
min_field_count--;
} else if (e->Variable.default_value.kind != ExactValue_Invalid) {
min_field_count--;
} else {
break;
}
}
if (cl->elems[0]->kind == AstNode_FieldValue) {
bool *fields_visited = gb_alloc_array(c->allocator, bool, field_count);
@@ -7293,7 +7308,7 @@ ExprKind check_expr_base_internal(Checker *c, Operand *o, AstNode *node, Type *t
continue;
}
if (index >= field_count) {
error(o->expr, "Too many values in structure literal, expected %td", field_count);
error(o->expr, "Too many values in structure literal, expected %td, got %td", field_count, cl->elems.count);
break;
}
@@ -7322,7 +7337,13 @@ ExprKind check_expr_base_internal(Checker *c, Operand *o, AstNode *node, Type *t
check_assignment(c, o, field->type, str_lit("structure literal"));
}
if (cl->elems.count < field_count) {
error(cl->close, "Too few values in structure literal, expected %td, got %td", field_count, cl->elems.count);
if (min_field_count < field_count) {
if (cl->elems.count < min_field_count) {
error(cl->close, "Too few values in structure literal, expected at least %td, got %td", min_field_count, cl->elems.count);
}
} else {
error(cl->close, "Too few values in structure literal, expected %td, got %td", field_count, cl->elems.count);
}
}
}
}

31
src/ir_print.cpp
View File

@@ -390,7 +390,11 @@ void ir_print_compound_element(irFileBuffer *f, irModule *m, ExactValue v, Type
ir_fprintf(f, " ");
if (v.kind == ExactValue_Invalid || base_type(elem_type) == t_any) {
ir_fprintf(f, "zeroinitializer");
if (ir_type_has_default_values(elem_type)) {
ir_print_exact_value(f, m, v, elem_type);
} else {
ir_fprintf(f, "zeroinitializer");
}
} else {
ir_print_exact_value(f, m, v, elem_type);
}
@@ -402,7 +406,11 @@ void ir_print_exact_value(irFileBuffer *f, irModule *m, ExactValue value, Type *
switch (value.kind) {
case ExactValue_Bool:
ir_fprintf(f, "%s", (value.value_bool ? "true" : "false"));
if (value.value_bool) {
ir_fprintf(f, "true");
} else {
ir_fprintf(f, "false");
}
break;
case ExactValue_String: {
String str = value.value_string;
@@ -514,9 +522,7 @@ void ir_print_exact_value(irFileBuffer *f, irModule *m, ExactValue value, Type *
if (!has_defaults) {
ir_fprintf(f, "zeroinitializer");
} else {
ir_fprintf(f, "[");
ir_fprintf(f, "]");
ir_print_compound_element(f, m, empty_exact_value, type);
}
break;
}
@@ -524,19 +530,14 @@ void ir_print_exact_value(irFileBuffer *f, irModule *m, ExactValue value, Type *
ir_fprintf(f, "[");
for (isize i = 0; i < elem_count; i++) {
if (i > 0) {
ir_fprintf(f, ", ");
}
if (i > 0) ir_fprintf(f, ", ");
TypeAndValue tav = type_and_value_of_expr(m->info, cl->elems[i]);
GB_ASSERT(tav.mode != Addressing_Invalid);
ir_print_compound_element(f, m, tav.value, elem_type);
}
for (isize i = elem_count; i < type->Array.count; i++) {
if (i >= elem_count) {
ir_fprintf(f, ", ");
}
ir_print_type(f, m, elem_type);
ir_fprintf(f, " zeroinitializer");
if (i >= elem_count) ir_fprintf(f, ", ");
ir_print_compound_element(f, m, empty_exact_value, elem_type);
}
ir_fprintf(f, "]");
@@ -611,8 +612,8 @@ void ir_print_exact_value(irFileBuffer *f, irModule *m, ExactValue value, Type *
visited[f->Variable.field_index] = true;
}
} else {
for (isize i = 0; i < value_count; i++) {
Entity *f = type->Record.fields[i];
for_array(i, cl->elems) {
Entity *f = type->Record.fields_in_src_order[i];
TypeAndValue tav = type_and_value_of_expr(m->info, cl->elems[i]);
ExactValue val = {};
if (tav.mode != Addressing_Invalid) {