andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1239 from FalsePattern/master

Browse Source 
Fixed compatibility with latest builds of Zig
This commit is contained in:
Lee Cannon 2023-06-17 19:31:27 +01:00 committed by GitHub
commit 5115bb27ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.zig.zon
View File

@ -12,8 +12,8 @@
.hash = "12204d32c44b494c0cbe553811dedfb7a73da37b13b492872dd4edc0340983072697",
},
.diffz = .{
.url = "https://github.com/ziglibs/diffz/archive/b966296b4489eb082b0831ec9a37d6f5e1906040.tar.gz",
.hash = "1220ed4aed884221108ad39f2658b69a91653e0bbc8ce429bc7f1bc4e58f6a751553",
.url = "https://github.com/ziglibs/diffz/archive/2fd03fc72760a700e41f30f2b180f26e11c3365b.tar.gz",
.hash = "1220de3226674f638ef4afcc919d121e06207a868cd163b24426b55d77c1048fc608",
},
.binned_allocator = .{
.url = "https://gist.github.com/silversquirl/c1e4840048fdf48e669b6eac76d80634/archive/8bbe137e65f26854ff936046d884a45d4fa156de.tar.gz",

4
src/analyser/InternPool.zig
View File

@ -3023,8 +3023,8 @@ test "float value" {
const f32_nan_value = try ip.get(gpa, .{ .float_32_value = std.math.nan_f32 });
const f32_qnan_value = try ip.get(gpa, .{ .float_32_value = std.math.qnan_f32 });
const f32_inf_value = try ip.get(gpa, .{ .float_32_value = std.math.inf_f32 });
const f32_ninf_value = try ip.get(gpa, .{ .float_32_value = -std.math.inf_f32 });
const f32_inf_value = try ip.get(gpa, .{ .float_32_value = std.math.inf(f32) });
const f32_ninf_value = try ip.get(gpa, .{ .float_32_value = -std.math.inf(f32) });
const f32_zero_value = try ip.get(gpa, .{ .float_32_value = 0.0 });
const f32_nzero_value = try ip.get(gpa, .{ .float_32_value = -0.0 });

2
src/analysis.zig
View File

@ -792,7 +792,7 @@ fn resolveTypeOfNodeUncached(analyser: *Analyser, node_handle: NodeWithHandle) e
}
// Bind type params to the arguments passed in the call.
const param_len = std.math.min(call.ast.params.len, expected_params);
const param_len = @min(call.ast.params.len, expected_params);
var i: usize = 0;
while (ast.nextFnParam(&it)) |decl_param| : (i += 1) {
if (i >= param_len) break;