mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-15 07:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Unable to initialize a typeid field in a struct literal #501

Browse Source
This commit is contained in:
gingerBill
2019-12-15 09:48:05 +00:00
parent b8c534eba9
commit e6f26b9931
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/check_expr.cpp
View File

@@ -7299,7 +7299,7 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
}
fields_visited[sel.index[0]] = true;
check_expr_with_type_hint(c, o, fv->value, field->type);
check_expr_or_type(c, o, fv->value, field->type);
if (is_type_any(field->type) || is_type_union(field->type) || is_type_raw_union(field->type)) {
is_constant = false;
@@ -7308,7 +7308,6 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
is_constant = o->mode == Addressing_Constant;
}
check_assignment(c, o, field->type, str_lit("structure literal"));
}
} else {
@@ -7334,9 +7333,9 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
field = t->Struct.fields[index];
}
check_expr_with_type_hint(c, o, elem, field->type);
check_expr_or_type(c, o, elem, field->type);
if (is_type_any(field->type) || is_type_union(field->type) || is_type_raw_union(field->type)) {
if (is_type_any(field->type) || is_type_union(field->type) || is_type_raw_union(field->type) || is_type_typeid(field->type)) {
is_constant = false;
}
if (is_constant) {