From ce841d1dc44e23f173ebb02b7c2d00bca5b800d3 Mon Sep 17 00:00:00 2001 From: SuperAuguste Date: Thu, 16 Jul 2020 11:05:56 -0400 Subject: [PATCH] ids -> tags (part 2) --- src/analysis.zig | 4 ++-- src/references.zig | 2 +- src/semantic_tokens.zig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/analysis.zig b/src/analysis.zig index d61773c..d46f284 100644 --- a/src/analysis.zig +++ b/src/analysis.zig @@ -1019,7 +1019,7 @@ pub fn getFieldAccessType( while (true) { const tok = tokenizer.next(); - switch (tok.tag) { + switch (tok.id) { .Eof => return FieldAccessReturn{ .original = current_type, .unwrapped = try resolveDerefType(store, arena, current_type, &bound_type_params), @@ -1806,7 +1806,7 @@ fn lookupSymbolGlobalInternal( if (scope.decls.getEntry(symbol)) |candidate| { switch (candidate.value) { .ast_node => |node| { - if (node.id == .ContainerField) continue; + if (node.tag == .ContainerField) continue; }, .label_decl => continue, else => {}, diff --git a/src/references.zig b/src/references.zig index f6ec9c3..5809c54 100644 --- a/src/references.zig +++ b/src/references.zig @@ -75,7 +75,7 @@ fn symbolReferencesInternal( const node = node_handle.node; const handle = node_handle.handle; - switch (node.id) { + switch (node.tag) { .ContainerDecl, .Root, .Block => { var idx: usize = 0; while (node.iterate(idx)) |child| : (idx += 1) { diff --git a/src/semantic_tokens.zig b/src/semantic_tokens.zig index 1e274b4..546f960 100644 --- a/src/semantic_tokens.zig +++ b/src/semantic_tokens.zig @@ -232,7 +232,7 @@ fn writeNodeTokens(builder: *Builder, arena: *std.heap.ArenaAllocator, store: *D var child_frame = try arena.child_allocator.alignedAlloc(u8, std.Target.stack_align, FrameSize); defer arena.child_allocator.free(child_frame); - switch (node.id) { + switch (node.tag) { .Root, .Block => { const first_tok = if (node.cast(ast.Node.Block)) |block_node| block: { try writeToken(builder, block_node.label, .label);