From 5aff17afb0259d12e12c2fb830ebd68d053f7844 Mon Sep 17 00:00:00 2001 From: max Date: Thu, 15 Sep 2022 02:56:17 +0800 Subject: [PATCH] sync with zig master version llvm15 (#652) --- src/analysis.zig | 5 ++--- src/ast.zig | 3 +-- src/inlay_hints.zig | 3 +-- src/semantic_tokens.zig | 5 ++--- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/analysis.zig b/src/analysis.zig index 6632e34..884b593 100644 --- a/src/analysis.zig +++ b/src/analysis.zig @@ -1617,7 +1617,7 @@ pub fn documentPositionContext(arena: *std.heap.ArenaAllocator, document: types. fn addOutlineNodes(allocator: std.mem.Allocator, tree: Ast, child: Ast.Node.Index, context: *GetDocumentSymbolsContext) anyerror!void { switch (tree.nodes.items(.tag)[child]) { .string_literal, - .integer_literal, + .number_literal, .builtin_call, .builtin_call_comma, .builtin_call_two, @@ -3037,8 +3037,7 @@ fn makeScopeInternal(allocator: std.mem.Allocator, context: ScopeContext, node_i .anyframe_type, .anyframe_literal, .char_literal, - .integer_literal, - .float_literal, + .number_literal, .unreachable_literal, .@"continue", => {}, diff --git a/src/ast.zig b/src/ast.zig index dcdda74..548faa8 100644 --- a/src/ast.zig +++ b/src/ast.zig @@ -462,8 +462,7 @@ pub fn lastToken(tree: Ast, node: Ast.Node.Index) Ast.TokenIndex { .anyframe_literal, .char_literal, - .integer_literal, - .float_literal, + .number_literal, .unreachable_literal, .identifier, .deref, diff --git a/src/inlay_hints.zig b/src/inlay_hints.zig index 077b340..3cbd2b9 100644 --- a/src/inlay_hints.zig +++ b/src/inlay_hints.zig @@ -326,8 +326,7 @@ fn writeNodeInlayHint(builder: *Builder, arena: *std.heap.ArenaAllocator, store: .anyframe_type, .anyframe_literal, .char_literal, - .integer_literal, - .float_literal, + .number_literal, .unreachable_literal, .identifier, .enum_literal, diff --git a/src/semantic_tokens.zig b/src/semantic_tokens.zig index fbca3fd..fe8d899 100644 --- a/src/semantic_tokens.zig +++ b/src/semantic_tokens.zig @@ -109,7 +109,7 @@ const Builder = struct { const tok_id = tree.tokens.items(.tag)[tok]; const tok_type: TokenType = switch (tok_id) { .keyword_unreachable => .keywordLiteral, - .integer_literal, .float_literal => .number, + .number_literal => .number, .string_literal, .multiline_string_literal_line, .char_literal => .string, .period, .comma, .r_paren, .l_paren, .r_brace, .l_brace, .semicolon, .colon => return, @@ -720,8 +720,7 @@ fn writeNodeTokens(builder: *Builder, arena: *std.heap.ArenaAllocator, store: *D try writeToken(builder, main_token, .keyword); try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, node_data[node].lhs }); }, - .integer_literal, - .float_literal, + .number_literal, => { try writeToken(builder, main_token, .number); },