mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-15 13:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig fmt: rewrite inline functions as callconv(.Inline)

Browse Source
This commit is contained in:
Andrew Kelley 2021-02-21 18:20:46 -07:00
parent 878e99d580
commit c6efb23796
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/std/zig/parser_test.zig
View File

@ -4,18 +4,16 @@
// The MIT license requires this copyright notice to be included in all copies
// and substantial portions of the software.
// TODO Remove this after zig 0.8.0 is released.
// TODO need to add the logic to make this test pass. it was added in master
// but was not added in the ast-memory-layout branch yet.
//test "zig fmt: rewrite inline functions as callconv(.Inline)" {
// try testTransform(
// \\inline fn foo() void {}
// \\
// ,
// \\fn foo() callconv(.Inline) void {}
// \\
// );
//}
// TODO Remove this after zig 0.9.0 is released.
test "zig fmt: rewrite inline functions as callconv(.Inline)" {
try testTransform(
\\inline fn foo() void {}
\\
,
\\fn foo() callconv(.Inline) void {}
\\
);
}
test "zig fmt: simple top level comptime block" {
try testCanonical(
@ -2490,8 +2488,6 @@ test "zig fmt: function attributes" {
\\pub extern fn foo() void;
\\extern "c" fn foo() void;
\\pub extern "c" fn foo() void;
\\inline fn foo() void {}
\\pub inline fn foo() void {}
\\noinline fn foo() void {}
\\pub noinline fn foo() void {}
\\

10
lib/std/zig/render.zig
View File

@ -79,6 +79,11 @@ fn renderMember(ais: *Ais, tree: ast.Tree, decl: ast.Node.Index, space: Space) E
}
}
while (i < fn_token) : (i += 1) {
if (token_tags[i] == .keyword_inline) {
// TODO remove this special case when 0.9.0 is released.
// See the commit that introduced this comment for more details.
continue;
}
try renderToken(ais, tree, i, .space);
}
assert(datas[decl].rhs != 0);
@ -1260,6 +1265,9 @@ fn renderFnProto(ais: *Ais, tree: ast.Tree, fn_proto: ast.full.FnProto, space: S
const token_tags = tree.tokens.items(.tag);
const token_starts = tree.tokens.items(.start);
const is_inline = fn_proto.ast.fn_token > 0 and
token_tags[fn_proto.ast.fn_token - 1] == .keyword_inline;
const after_fn_token = fn_proto.ast.fn_token + 1;
const lparen = if (token_tags[after_fn_token] == .identifier) blk: {
try renderToken(ais, tree, fn_proto.ast.fn_token, .space); // fn
@ -1435,6 +1443,8 @@ fn renderFnProto(ais: *Ais, tree: ast.Tree, fn_proto: ast.full.FnProto, space: S
try renderToken(ais, tree, callconv_lparen, .none); // (
try renderExpression(ais, tree, fn_proto.ast.callconv_expr, .none);
try renderToken(ais, tree, callconv_rparen, .space); // )
} else if (is_inline) {
try ais.writer().writeAll("callconv(.Inline) ");
}
if (token_tags[maybe_bang] == .bang) {