aboutsummaryrefslogtreecommitdiff
path: root/src/analyze.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/analyze.cpp')
-rw-r--r--src/analyze.cpp97
1 files changed, 63 insertions, 34 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp
index 5bcd7cc0ba..b3cf10737c 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -1325,7 +1325,7 @@ static void resolve_enum_type(CodeGen *g, ImportTableEntry *import, TypeTableEnt
uint32_t field_count = decl_node->data.struct_decl.fields.length;
- enum_type->data.enumeration.field_count = field_count;
+ enum_type->data.enumeration.src_field_count = field_count;
enum_type->data.enumeration.fields = allocate<TypeEnumField>(field_count);
ZigLLVMDIEnumerator **di_enumerators = allocate<ZigLLVMDIEnumerator*>(field_count);
@@ -2451,8 +2451,8 @@ static LabelTableEntry *find_label(CodeGen *g, BlockContext *orig_context, Buf *
return nullptr;
}
-static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {
- for (uint32_t i = 0; i < enum_type->data.enumeration.field_count; i += 1) {
+static TypeEnumField *find_enum_type_field(TypeTableEntry *enum_type, Buf *name) {
+ for (uint32_t i = 0; i < enum_type->data.enumeration.src_field_count; i += 1) {
TypeEnumField *type_enum_field = &enum_type->data.enumeration.fields[i];
if (buf_eql_buf(type_enum_field->name, name)) {
return type_enum_field;
@@ -2467,7 +2467,7 @@ static TypeTableEntry *analyze_enum_value_expr(CodeGen *g, ImportTableEntry *imp
{
assert(field_access_node->type == NodeTypeFieldAccessExpr);
- TypeEnumField *type_enum_field = get_enum_field(enum_type, field_name);
+ TypeEnumField *type_enum_field = find_enum_type_field(enum_type, field_name);
if (type_enum_field->type_entry->id == TypeTableEntryIdInvalid) {
return g->builtin_types.entry_invalid;
}
@@ -2715,6 +2715,41 @@ static TypeTableEntry *analyze_container_init_expr(CodeGen *g, ImportTableEntry
}
}
+static TypeTableEntry *analyze_member_access(CodeGen *g, bool wrapped_in_fn_call,
+ TypeTableEntry *bare_struct_type, Buf *field_name, AstNode *node, TypeTableEntry *struct_type)
+{
+ assert(node->type == NodeTypeFieldAccessExpr);
+ if (wrapped_in_fn_call && !is_slice(bare_struct_type)) {
+ BlockContext *container_block_context = get_container_block_context(bare_struct_type);
+ assert(container_block_context);
+ auto entry = container_block_context->decl_table.maybe_get(field_name);
+ AstNode *fn_decl_node = entry ? entry->value : nullptr;
+ if (fn_decl_node && fn_decl_node->type == NodeTypeFnProto) {
+ resolve_top_level_decl(g, fn_decl_node, false);
+ TopLevelDecl *tld = get_as_top_level_decl(fn_decl_node);
+ if (tld->resolution == TldResolutionInvalid) {
+ return g->builtin_types.entry_invalid;
+ }
+
+ node->data.field_access_expr.is_member_fn = true;
+ FnTableEntry *fn_entry = fn_decl_node->data.fn_proto.fn_table_entry;
+ if (fn_entry->type_entry->id == TypeTableEntryIdGenericFn) {
+ return resolve_expr_const_val_as_generic_fn(g, node, fn_entry->type_entry, false);
+ } else {
+ return resolve_expr_const_val_as_fn(g, node, fn_entry, false);
+ }
+ } else {
+ add_node_error(g, node, buf_sprintf("no function named '%s' in '%s'",
+ buf_ptr(field_name), buf_ptr(&bare_struct_type->name)));
+ return g->builtin_types.entry_invalid;
+ }
+ } else {
+ add_node_error(g, node,
+ buf_sprintf("no member named '%s' in '%s'", buf_ptr(field_name), buf_ptr(&struct_type->name)));
+ return g->builtin_types.entry_invalid;
+ }
+}
+
static TypeTableEntry *analyze_field_access_expr(CodeGen *g, ImportTableEntry *import, BlockContext *context,
TypeTableEntry *expected_type, AstNode *node)
{
@@ -2742,34 +2777,28 @@ static TypeTableEntry *analyze_field_access_expr(CodeGen *g, ImportTableEntry *i
node->data.field_access_expr.type_struct_field = find_struct_type_field(bare_struct_type, field_name);
if (node->data.field_access_expr.type_struct_field) {
return node->data.field_access_expr.type_struct_field->type_entry;
- } else if (wrapped_in_fn_call && !is_slice(bare_struct_type)) {
- BlockContext *container_block_context = get_container_block_context(bare_struct_type);
- assert(container_block_context);
- auto entry = container_block_context->decl_table.maybe_get(field_name);
- AstNode *fn_decl_node = entry ? entry->value : nullptr;
- if (fn_decl_node && fn_decl_node->type == NodeTypeFnProto) {
- resolve_top_level_decl(g, fn_decl_node, false);
- TopLevelDecl *tld = get_as_top_level_decl(fn_decl_node);
- if (tld->resolution == TldResolutionInvalid) {
- return g->builtin_types.entry_invalid;
- }
+ } else {
+ return analyze_member_access(g, wrapped_in_fn_call, bare_struct_type, field_name,
+ node, struct_type);
+ }
+ } else if (struct_type->id == TypeTableEntryIdEnum || (struct_type->id == TypeTableEntryIdPointer &&
+ struct_type->data.pointer.child_type->id == TypeTableEntryIdEnum))
+ {
+ TypeTableEntry *bare_struct_type = (struct_type->id == TypeTableEntryIdEnum) ?
+ struct_type : struct_type->data.pointer.child_type;
- node->data.field_access_expr.is_member_fn = true;
- FnTableEntry *fn_entry = fn_decl_node->data.fn_proto.fn_table_entry;
- if (fn_entry->type_entry->id == TypeTableEntryIdGenericFn) {
- return resolve_expr_const_val_as_generic_fn(g, node, fn_entry->type_entry, false);
- } else {
- return resolve_expr_const_val_as_fn(g, node, fn_entry, false);
- }
- } else {
- add_node_error(g, node, buf_sprintf("no function named '%s' in '%s'",
- buf_ptr(field_name), buf_ptr(&bare_struct_type->name)));
- return g->builtin_types.entry_invalid;
- }
+ if (!bare_struct_type->data.enumeration.complete) {
+ resolve_struct_type(g, bare_struct_type->data.enumeration.decl_node->owner, bare_struct_type);
+ }
+
+ node->data.field_access_expr.bare_struct_type = bare_struct_type;
+ node->data.field_access_expr.type_enum_field = find_enum_type_field(bare_struct_type, field_name);
+
+ if (node->data.field_access_expr.type_enum_field) {
+ return node->data.field_access_expr.type_enum_field->type_entry;
} else {
- add_node_error(g, node,
- buf_sprintf("no member named '%s' in '%s'", buf_ptr(field_name), buf_ptr(&struct_type->name)));
- return g->builtin_types.entry_invalid;
+ return analyze_member_access(g, wrapped_in_fn_call, bare_struct_type, field_name,
+ node, struct_type);
}
} else if (struct_type->id == TypeTableEntryIdArray) {
if (buf_eql_str(field_name, "len")) {
@@ -5269,7 +5298,7 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry
if (type_entry->id == TypeTableEntryIdInvalid) {
return type_entry;
} else if (type_entry->id == TypeTableEntryIdEnum) {
- uint64_t value_count = type_entry->data.enumeration.field_count;
+ uint64_t value_count = type_entry->data.enumeration.src_field_count;
return resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type,
value_count, false);
} else {
@@ -6130,7 +6159,7 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
size_t *field_use_counts = nullptr;
HashMap<int, AstNode *, int_hash, int_eq> err_use_nodes = {};
if (expr_type->id == TypeTableEntryIdEnum) {
- field_use_counts = allocate<size_t>(expr_type->data.enumeration.field_count);
+ field_use_counts = allocate<size_t>(expr_type->data.enumeration.src_field_count);
} else if (expr_type->id == TypeTableEntryIdErrorUnion) {
err_use_nodes.init(10);
}
@@ -6168,7 +6197,7 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
if (expr_type->id == TypeTableEntryIdEnum) {
if (item_node->type == NodeTypeSymbol) {
Buf *field_name = item_node->data.symbol_expr.symbol;
- TypeEnumField *type_enum_field = get_enum_field(expr_type, field_name);
+ TypeEnumField *type_enum_field = find_enum_type_field(expr_type, field_name);
if (type_enum_field) {
item_node->data.symbol_expr.enum_field = type_enum_field;
if (!var_type) {
@@ -6300,7 +6329,7 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
}
if (expr_type->id == TypeTableEntryIdEnum && !else_prong) {
- for (uint32_t i = 0; i < expr_type->data.enumeration.field_count; i += 1) {
+ for (uint32_t i = 0; i < expr_type->data.enumeration.src_field_count; i += 1) {
if (field_use_counts[i] == 0) {
add_node_error(g, node,
buf_sprintf("enumeration value '%s' not handled in switch",
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-28 07:39:20 +0000