mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-05-25 13:18:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for Some_Struct{multiple_return_value(), 123}

Browse Source
This commit is contained in:
gingerBill
2026-04-21 17:17:59 +01:00
parent 0a080751e0
commit b1e8ec5e64
2 changed files with 192 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/check_expr.cpp
View File

@@ -10385,9 +10385,12 @@ gb_internal ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *
} else {
bool seen_field_value = false;
for_array(index, cl->elems) {
isize handled_elem_count = 0;
isize index = 0;
for (Ast *elem : cl->elems) {
defer (index += 1);
Entity *field = nullptr;
Ast *elem = cl->elems[index];
if (elem->kind == Ast_FieldValue) {
seen_field_value = true;
error(elem, "Mixture of 'field = value' and value elements in a literal is not allowed");
@@ -10406,23 +10409,46 @@ gb_internal ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *
}
Operand o = {};
check_expr_or_type(c, &o, elem, field->type);
if (elem_cannot_be_constant(field->type)) {
check_multi_expr_with_type_hint(c, &o, elem, field->type);
if (is_type_tuple(o.type)) {
is_constant = false;
}
if (is_constant) {
is_constant = check_is_operand_compound_lit_constant(c, &o, field->type);
TypeTuple *tt = &o.type->Tuple;
isize jj = 0;
for (Entity *src_field : tt->variables) {
Operand src_o = o;
src_o.type = src_field->type;
field = t->Struct.fields[index + (jj++)];
check_assignment(c, &src_o, field->type, str_lit("structure literal"));
}
index += tt->variables.count-1;
handled_elem_count += tt->variables.count;
} else {
check_not_tuple(c, &o);
if (elem_cannot_be_constant(field->type)) {
is_constant = false;
}
if (is_constant) {
is_constant = check_is_operand_compound_lit_constant(c, &o, field->type);
}
check_assignment(c, &o, field->type, str_lit("structure literal"));
handled_elem_count += 1;
}
check_assignment(c, &o, field->type, str_lit("structure literal"));
}
if (cl->elems.count < field_count) {
if (min_field_count < field_count) {
if (cl->elems.count < min_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 {
}
} else if (handled_elem_count != field_count) {
error(cl->close, "Too few values in structure literal, expected %td, got %td", field_count, cl->elems.count);
}
}