authorgravatar for r00ster91@proton.meWooster <r00ster91@proton.me> 2022-12-13 21:54:04+01:00
committergravatar for r00ster91@proton.meWooster <r00ster91@proton.me> 2022-12-17 14:11:33+01:00
log7350ea3e2da4d4e6ef5092cd9f0832beef0291d5
tree071595ca763a8fe5ed39751e9f4d1cb0079a028a
parent20d3fd901eb6a7ddc1340107ae00e0f2014552e3

std.builtin: rename Type.Fn's args to params

This was a poor naming choice; these are parameters, not arguments. Parameters specify what kind of arguments are expected, whereas the arguments are the actual values passed.

14 files changed, 44 insertions(+), 44 deletions(-)

doc/langref.html.in+1-1
......@@ -5242,7 +5242,7 @@ const math = std.math;
52425242const testing = std.testing;
52435243
52445244test "fn reflection" {
5245 try testing.expect(@typeInfo(@TypeOf(testing.expect)).Fn.args[0].type.? == bool);
5245 try testing.expect(@typeInfo(@TypeOf(testing.expect)).Fn.params[0].type.? == bool);
52465246 try testing.expect(@typeInfo(@TypeOf(testing.tmpDir)).Fn.return_type.? == testing.TmpDir);
52475247
52485248 try testing.expect(@typeInfo(@TypeOf(math.Log2Int)).Fn.is_generic);
lib/std/builtin.zig+1-1
......@@ -367,7 +367,7 @@ pub const Type = union(enum) {
367367 is_var_args: bool,
368368 /// TODO change the language spec to make this not optional.
369369 return_type: ?type,
370 args: []const Param,
370 params: []const Param,
371371
372372 /// This data structure is used by the Zig language code generation and
373373 /// therefore must be kept in sync with the compiler implementation.
lib/std/fmt.zig+1-1
......@@ -1724,7 +1724,7 @@ pub const ParseIntError = error{
17241724/// ) !void;
17251725///
17261726pub fn Formatter(comptime format_fn: anytype) type {
1727 const Data = @typeInfo(@TypeOf(format_fn)).Fn.args[0].type.?;
1727 const Data = @typeInfo(@TypeOf(format_fn)).Fn.params[0].type.?;
17281728 return struct {
17291729 data: Data,
17301730 pub fn format(
lib/std/hash_map.zig+10-10
......@@ -186,11 +186,11 @@ pub fn verifyContext(
186186 const info = @typeInfo(@TypeOf(hash));
187187 if (info == .Fn) {
188188 const func = info.Fn;
189 if (func.args.len != 2) {
189 if (func.params.len != 2) {
190190 errors = errors ++ lazy.err_invalid_hash_signature;
191191 } else {
192192 var emitted_signature = false;
193 if (func.args[0].type) |Self| {
193 if (func.params[0].type) |Self| {
194194 if (Self == Context) {
195195 // pass, this is always fine.
196196 } else if (Self == *const Context) {
......@@ -231,12 +231,12 @@ pub fn verifyContext(
231231 errors = errors ++ ", but is " ++ @typeName(Self);
232232 }
233233 }
234 if (func.args[1].type != null and func.args[1].type.? != PseudoKey) {
234 if (func.params[1].type != null and func.params[1].type.? != PseudoKey) {
235235 if (!emitted_signature) {
236236 errors = errors ++ lazy.err_invalid_hash_signature;
237237 emitted_signature = true;
238238 }
239 errors = errors ++ lazy.deep_prefix ++ "Second parameter must be " ++ @typeName(PseudoKey) ++ ", but is " ++ @typeName(func.args[1].type.?);
239 errors = errors ++ lazy.deep_prefix ++ "Second parameter must be " ++ @typeName(PseudoKey) ++ ", but is " ++ @typeName(func.params[1].type.?);
240240 }
241241 if (func.return_type != null and func.return_type.? != Hash) {
242242 if (!emitted_signature) {
......@@ -263,11 +263,11 @@ pub fn verifyContext(
263263 if (info == .Fn) {
264264 const func = info.Fn;
265265 const args_len = if (is_array) 4 else 3;
266 if (func.args.len != args_len) {
266 if (func.params.len != args_len) {
267267 errors = errors ++ lazy.err_invalid_eql_signature;
268268 } else {
269269 var emitted_signature = false;
270 if (func.args[0].type) |Self| {
270 if (func.params[0].type) |Self| {
271271 if (Self == Context) {
272272 // pass, this is always fine.
273273 } else if (Self == *const Context) {
......@@ -308,19 +308,19 @@ pub fn verifyContext(
308308 errors = errors ++ ", but is " ++ @typeName(Self);
309309 }
310310 }
311 if (func.args[1].type.? != PseudoKey) {
311 if (func.params[1].type.? != PseudoKey) {
312312 if (!emitted_signature) {
313313 errors = errors ++ lazy.err_invalid_eql_signature;
314314 emitted_signature = true;
315315 }
316 errors = errors ++ lazy.deep_prefix ++ "Second parameter must be " ++ @typeName(PseudoKey) ++ ", but is " ++ @typeName(func.args[1].type.?);
316 errors = errors ++ lazy.deep_prefix ++ "Second parameter must be " ++ @typeName(PseudoKey) ++ ", but is " ++ @typeName(func.params[1].type.?);
317317 }
318 if (func.args[2].type.? != Key) {
318 if (func.params[2].type.? != Key) {
319319 if (!emitted_signature) {
320320 errors = errors ++ lazy.err_invalid_eql_signature;
321321 emitted_signature = true;
322322 }
323 errors = errors ++ lazy.deep_prefix ++ "Third parameter must be " ++ @typeName(Key) ++ ", but is " ++ @typeName(func.args[2].type.?);
323 errors = errors ++ lazy.deep_prefix ++ "Third parameter must be " ++ @typeName(Key) ++ ", but is " ++ @typeName(func.params[2].type.?);
324324 }
325325 if (func.return_type.? != bool) {
326326 if (!emitted_signature) {
lib/std/meta.zig+2-2
......@@ -1084,8 +1084,8 @@ pub fn ArgsTuple(comptime Function: type) type {
10841084 if (function_info.is_var_args)
10851085 @compileError("Cannot create ArgsTuple for variadic function");
10861086
1087 var argument_field_list: [function_info.args.len]type = undefined;
1088 inline for (function_info.args) |arg, i| {
1087 var argument_field_list: [function_info.params.len]type = undefined;
1088 inline for (function_info.params) |arg, i| {
10891089 const T = arg.type.?;
10901090 argument_field_list[i] = T;
10911091 }
lib/std/start.zig+1-1
......@@ -634,7 +634,7 @@ pub fn callMain() u8 {
634634}
635635
636636pub fn call_wWinMain() std.os.windows.INT {
637 const MAIN_HINSTANCE = @typeInfo(@TypeOf(root.wWinMain)).Fn.args[0].type.?;
637 const MAIN_HINSTANCE = @typeInfo(@TypeOf(root.wWinMain)).Fn.params[0].type.?;
638638 const hInstance = @ptrCast(MAIN_HINSTANCE, std.os.windows.kernel32.GetModuleHandleW(null).?);
639639 const lpCmdLine = std.os.windows.kernel32.GetCommandLineW();
640640
test/behavior/bugs/12885.zig+2-2
......@@ -15,7 +15,7 @@ test "ErrorSet comptime_field_ptr" {
1515}
1616
1717const fn_info = .{
18 .args = [_]builtin.Type.Fn.Param{
18 .params = [_]builtin.Type.Fn.Param{
1919 .{ .is_generic = false, .is_noalias = false, .type = u8 },
2020 },
2121};
......@@ -26,7 +26,7 @@ const Bar = @Type(.{
2626 .is_generic = false,
2727 .is_var_args = false,
2828 .return_type = void,
29 .args = &fn_info.args,
29 .params = &fn_info.params,
3030 },
3131});
3232test "fn comptime_field_ptr" {
test/behavior/reflection.zig+4-4
......@@ -9,10 +9,10 @@ test "reflection: function return type, var args, and param types" {
99 const info = @typeInfo(@TypeOf(dummy)).Fn;
1010 try expect(info.return_type.? == i32);
1111 try expect(!info.is_var_args);
12 try expect(info.args.len == 3);
13 try expect(info.args[0].type.? == bool);
14 try expect(info.args[1].type.? == i32);
15 try expect(info.args[2].type.? == f32);
12 try expect(info.params.len == 3);
13 try expect(info.params[0].type.? == bool);
14 try expect(info.params[1].type.? == i32);
15 try expect(info.params[2].type.? == f32);
1616 }
1717}
1818
test/behavior/type.zig+1-1
......@@ -512,7 +512,7 @@ test "Type.Fn" {
512512 .is_generic = false,
513513 .is_var_args = false,
514514 .return_type = void,
515 .args = &.{
515 .params = &.{
516516 .{ .is_generic = false, .is_noalias = false, .type = c_int },
517517 .{ .is_generic = false, .is_noalias = false, .type = some_ptr },
518518 },
test/behavior/type_info.zig+17-17
......@@ -365,7 +365,7 @@ fn testFunction() !void {
365365 try expect(fn_info.Fn.alignment > 0);
366366 try expect(fn_info.Fn.calling_convention == .C);
367367 try expect(!fn_info.Fn.is_generic);
368 try expect(fn_info.Fn.args.len == 2);
368 try expect(fn_info.Fn.params.len == 2);
369369 try expect(fn_info.Fn.is_var_args);
370370 try expect(fn_info.Fn.return_type.? == usize);
371371 const fn_aligned_info = @typeInfo(@TypeOf(typeInfoFooAligned));
......@@ -377,31 +377,31 @@ extern fn typeInfoFooAligned(a: usize, b: bool, ...) align(4) callconv(.C) usize
377377
378378test "type info: generic function types" {
379379 const G1 = @typeInfo(@TypeOf(generic1));
380 try expect(G1.Fn.args.len == 1);
381 try expect(G1.Fn.args[0].is_generic == true);
382 try expect(G1.Fn.args[0].type == null);
380 try expect(G1.Fn.params.len == 1);
381 try expect(G1.Fn.params[0].is_generic == true);
382 try expect(G1.Fn.params[0].type == null);
383383 try expect(G1.Fn.return_type == void);
384384
385385 const G2 = @typeInfo(@TypeOf(generic2));
386 try expect(G2.Fn.args.len == 3);
387 try expect(G2.Fn.args[0].is_generic == false);
388 try expect(G2.Fn.args[0].type == type);
389 try expect(G2.Fn.args[1].is_generic == true);
390 try expect(G2.Fn.args[1].type == null);
391 try expect(G2.Fn.args[2].is_generic == false);
392 try expect(G2.Fn.args[2].type == u8);
386 try expect(G2.Fn.params.len == 3);
387 try expect(G2.Fn.params[0].is_generic == false);
388 try expect(G2.Fn.params[0].type == type);
389 try expect(G2.Fn.params[1].is_generic == true);
390 try expect(G2.Fn.params[1].type == null);
391 try expect(G2.Fn.params[2].is_generic == false);
392 try expect(G2.Fn.params[2].type == u8);
393393 try expect(G2.Fn.return_type == void);
394394
395395 const G3 = @typeInfo(@TypeOf(generic3));
396 try expect(G3.Fn.args.len == 1);
397 try expect(G3.Fn.args[0].is_generic == true);
398 try expect(G3.Fn.args[0].type == null);
396 try expect(G3.Fn.params.len == 1);
397 try expect(G3.Fn.params[0].is_generic == true);
398 try expect(G3.Fn.params[0].type == null);
399399 try expect(G3.Fn.return_type == null);
400400
401401 const G4 = @typeInfo(@TypeOf(generic4));
402 try expect(G4.Fn.args.len == 1);
403 try expect(G4.Fn.args[0].is_generic == true);
404 try expect(G4.Fn.args[0].type == null);
402 try expect(G4.Fn.params.len == 1);
403 try expect(G4.Fn.params[0].is_generic == true);
404 try expect(G4.Fn.params[0].type == null);
405405 try expect(G4.Fn.return_type == null);
406406}
407407
test/cases/compile_errors/reify_type.Fn_with_is_generic_true.zig+1-1
......@@ -5,7 +5,7 @@ const Foo = @Type(.{
55 .is_generic = true,
66 .is_var_args = false,
77 .return_type = u0,
8 .args = &.{},
8 .params = &.{},
99 },
1010});
1111comptime { _ = Foo; }
test/cases/compile_errors/reify_type.Fn_with_is_var_args_true_and_non-C_callconv.zig+1-1
......@@ -5,7 +5,7 @@ const Foo = @Type(.{
55 .is_generic = false,
66 .is_var_args = true,
77 .return_type = u0,
8 .args = &.{},
8 .params = &.{},
99 },
1010});
1111comptime { _ = Foo; }
test/cases/compile_errors/reify_type.Fn_with_return_type_null.zig+1-1
......@@ -5,7 +5,7 @@ const Foo = @Type(.{
55 .is_generic = false,
66 .is_var_args = false,
77 .return_type = null,
8 .args = &.{},
8 .params = &.{},
99 },
1010});
1111comptime { _ = Foo; }
test/cases/fn_typeinfo_passed_to_comptime_fn.zig+1-1
......@@ -9,7 +9,7 @@ fn someFn(arg: ?*c_int) f64 {
99 return 8;
1010}
1111fn foo(comptime info: std.builtin.Type) !void {
12 try std.testing.expect(info.Fn.args[0].type.? == ?*c_int);
12 try std.testing.expect(info.Fn.params[0].type.? == ?*c_int);
1313}
1414
1515// run