diff options
| author | Loris Cro <kappaloris@gmail.com> | 2023-01-24 19:18:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 19:18:52 +0100 |
| commit | 4e80253e207258f01620b15e44866bc46708e6b1 (patch) | |
| tree | 624ec42e610306e78745b96c118139b460c06b7a /src | |
| parent | af820bbb94a06c5bae34a38bda0f964620413e92 (diff) | |
| parent | dd8e16b9065bc33195a398744c663718bec57d4d (diff) | |
| download | zig-4e80253e207258f01620b15e44866bc46708e6b1.tar.gz zig-4e80253e207258f01620b15e44866bc46708e6b1.zip | |
Merge pull request #14395 from der-teufel-programming/master
autodoc: Add Struct, Union, Enum handling in exprName, add tags for Enum and Union, anonymous types "work"
Diffstat (limited to 'src')
| -rw-r--r-- | src/Autodoc.zig | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/Autodoc.zig b/src/Autodoc.zig index 6441470fde..fab20bff85 100644 --- a/src/Autodoc.zig +++ b/src/Autodoc.zig @@ -586,6 +586,8 @@ const DocData = struct { privDecls: []usize = &.{}, // index into decls pubDecls: []usize = &.{}, // index into decls // (use src->fields to find field names) + tag: ?Expr = null, // tag type if specified + nonexhaustive: bool, }, Union: struct { name: []const u8, @@ -593,6 +595,8 @@ const DocData = struct { privDecls: []usize = &.{}, // index into decls pubDecls: []usize = &.{}, // index into decls fields: []Expr = &.{}, // (use src->fields to find names) + tag: ?Expr, // tag type if specified + auto_enum: bool, // tag is an auto enum }, Fn: struct { name: []const u8, @@ -2559,12 +2563,13 @@ fn walkInstruction( else parent_src; - const tag_type: ?Ref = if (small.has_tag_type) blk: { + const tag_type: ?DocData.Expr = if (small.has_tag_type) blk: { const tag_type = file.zir.extra[extra_index]; extra_index += 1; - break :blk @intToEnum(Ref, tag_type); + const tag_ref = @intToEnum(Ref, tag_type); + const wr = try self.walkRef(file, parent_scope, parent_src, tag_ref, false); + break :blk wr.expr; } else null; - _ = tag_type; const body_len = if (small.has_body_len) blk: { const body_len = file.zir.extra[extra_index]; @@ -2652,6 +2657,8 @@ fn walkInstruction( .privDecls = priv_decl_indexes.items, .pubDecls = decl_indexes.items, .fields = field_type_refs.items, + .tag = tag_type, + .auto_enum = small.auto_enum_tag, }, }; @@ -2698,12 +2705,13 @@ fn walkInstruction( else parent_src; - const tag_type: ?Ref = if (small.has_tag_type) blk: { + const tag_type: ?DocData.Expr = if (small.has_tag_type) blk: { const tag_type = file.zir.extra[extra_index]; extra_index += 1; - break :blk @intToEnum(Ref, tag_type); + const tag_ref = @intToEnum(Ref, tag_type); + const wr = try self.walkRef(file, parent_scope, parent_src, tag_ref, false); + break :blk wr.expr; } else null; - _ = tag_type; const body_len = if (small.has_body_len) blk: { const body_len = file.zir.extra[extra_index]; @@ -2816,6 +2824,8 @@ fn walkInstruction( .src = self_ast_node_index, .privDecls = priv_decl_indexes.items, .pubDecls = decl_indexes.items, + .tag = tag_type, + .nonexhaustive = small.nonexhaustive, }, }; if (self.ref_paths_pending_on_types.get(type_slot_index)) |paths| { @@ -4185,6 +4195,12 @@ fn collectStructFieldInfo( const break_inst = body[body.len - 1]; const operand = data[break_inst].@"break".operand; + try self.ast_nodes.append(self.arena, .{ + .file = self.files.getIndex(file).?, + .line = parent_src.line, + .col = 0, + .fields = null, // walkInstruction will fill `fields` if necessary + }); const walk_result = try self.walkRef(file, scope, parent_src, operand, false); break :expr walk_result.expr; }; |