diff options
| author | gingerBill <bill@gingerbill.org> | 2018-12-14 14:57:04 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2018-12-14 14:57:04 +0000 |
| commit | 0b6fc19fb0e48f30d0e506d6599ba61667d083f3 (patch) | |
| tree | 21509114a705055ccea30981cf0c6dca46abd54b /src/types.cpp | |
| parent | f2dae7023f5b70d9286b7ff3d0d471bebad78292 (diff) | |
Allow polymorphic cast on fields with `_` #302
Diffstat (limited to 'src/types.cpp')
| -rw-r--r-- | src/types.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/types.cpp b/src/types.cpp index 09fdce3f1..262e4c228 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -1870,10 +1870,10 @@ ProcTypeOverloadKind are_proc_types_overload_safe(Type *x, Type *y) { -Selection lookup_field_with_selection(Type *type_, String field_name, bool is_type, Selection sel); +Selection lookup_field_with_selection(Type *type_, String field_name, bool is_type, Selection sel, bool allow_blank_ident=false); -Selection lookup_field(Type *type_, String field_name, bool is_type) { - return lookup_field_with_selection(type_, field_name, is_type, empty_selection); +Selection lookup_field(Type *type_, String field_name, bool is_type, bool allow_blank_ident=false) { + return lookup_field_with_selection(type_, field_name, is_type, empty_selection, allow_blank_ident); } Selection lookup_field_from_index(Type *type, i64 index) { @@ -1931,10 +1931,10 @@ Selection lookup_field_from_index(Type *type, i64 index) { Entity *scope_lookup_current(Scope *s, String name); -Selection lookup_field_with_selection(Type *type_, String field_name, bool is_type, Selection sel) { +Selection lookup_field_with_selection(Type *type_, String field_name, bool is_type, Selection sel, bool allow_blank_ident) { GB_ASSERT(type_ != nullptr); - if (is_blank_ident(field_name)) { + if (!allow_blank_ident && is_blank_ident(field_name)) { return empty_selection; } @@ -1989,13 +1989,13 @@ Selection lookup_field_with_selection(Type *type_, String field_name, bool is_ty } } } else if (type->kind == Type_BitSet) { - return lookup_field_with_selection(type->BitSet.elem, field_name, true, sel); + return lookup_field_with_selection(type->BitSet.elem, field_name, true, sel, allow_blank_ident); } if (type->kind == Type_Generic && type->Generic.specialized != nullptr) { Type *specialized = type->Generic.specialized; - return lookup_field_with_selection(specialized, field_name, is_type, sel); + return lookup_field_with_selection(specialized, field_name, is_type, sel, allow_blank_ident); } } else if (type->kind == Type_Union) { @@ -2017,7 +2017,7 @@ Selection lookup_field_with_selection(Type *type_, String field_name, bool is_ty isize prev_count = sel.index.count; selection_add_index(&sel, i); // HACK(bill): Leaky memory - sel = lookup_field_with_selection(f->type, field_name, is_type, sel); + sel = lookup_field_with_selection(f->type, field_name, is_type, sel, allow_blank_ident); if (sel.entity != nullptr) { if (is_type_pointer(f->type)) { |