authorgravatar for me@tadeo.caTadeo Kondrak <me@tadeo.ca> 2021-02-08 14:22:43-07:00
committergravatar for me@tadeo.caTadeo Kondrak <me@tadeo.ca> 2021-02-10 20:22:19-07:00
logbcc13597fcec351f7231333fe6f5612c88d6eb65
treefd6c47f420c12a0c5cd9ad92a319e54cdda32440
parent7644e9a752ebe50c4372fae8ea0e8eaecb211508
signature Commit is signed but in an unrecognized format.

translate_c: switch from inline fn to callconv(.Inline)

1 files changed, 12 insertions(+), 4 deletions(-)

src/translate_c.zig+12-4
......@@ -4721,7 +4721,6 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a
47214721 const scope = &c.global_scope.base;
47224722
47234723 const pub_tok = try appendToken(c, .Keyword_pub, "pub");
4724 const inline_tok = try appendToken(c, .Keyword_inline, "inline");
47254724 const fn_tok = try appendToken(c, .Keyword_fn, "fn");
47264725 const name_tok = try appendIdentifier(c, name);
47274726 _ = try appendToken(c, .LParen, "(");
......@@ -4749,6 +4748,11 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a
47494748
47504749 _ = try appendToken(c, .RParen, ")");
47514750
4751 _ = try appendToken(c, .Keyword_callconv, "callconv");
4752 _ = try appendToken(c, .LParen, "(");
4753 const callconv_expr = try transCreateNodeEnumLiteral(c, "Inline");
4754 _ = try appendToken(c, .RParen, ")");
4755
47524756 const block_lbrace = try appendToken(c, .LBrace, "{");
47534757
47544758 const return_kw = try appendToken(c, .Keyword_return, "return");
......@@ -4788,8 +4792,8 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a
47884792 }, .{
47894793 .visib_token = pub_tok,
47904794 .name_token = name_tok,
4791 .extern_export_inline_token = inline_tok,
47924795 .body_node = &block.base,
4796 .callconv_expr = callconv_expr,
47934797 });
47944798 mem.copy(ast.Node.FnProto.ParamDecl, fn_proto.params(), fn_params.items);
47954799 return &fn_proto.base;
......@@ -5739,7 +5743,6 @@ fn transMacroFnDefine(c: *Context, m: *MacroCtx) ParseError!void {
57395743 const scope = &block_scope.base;
57405744
57415745 const pub_tok = try appendToken(c, .Keyword_pub, "pub");
5742 const inline_tok = try appendToken(c, .Keyword_inline, "inline");
57435746 const fn_tok = try appendToken(c, .Keyword_fn, "fn");
57445747 const name_tok = try appendIdentifier(c, m.name);
57455748 _ = try appendToken(c, .LParen, "(");
......@@ -5784,6 +5787,11 @@ fn transMacroFnDefine(c: *Context, m: *MacroCtx) ParseError!void {
57845787
57855788 _ = try appendToken(c, .RParen, ")");
57865789
5790 _ = try appendToken(c, .Keyword_callconv, "callconv");
5791 _ = try appendToken(c, .LParen, "(");
5792 const callconv_expr = try transCreateNodeEnumLiteral(c, "Inline");
5793 _ = try appendToken(c, .RParen, ")");
5794
57875795 const type_of = try c.createBuiltinCall("@TypeOf", 1);
57885796
57895797 const return_kw = try appendToken(c, .Keyword_return, "return");
......@@ -5815,9 +5823,9 @@ fn transMacroFnDefine(c: *Context, m: *MacroCtx) ParseError!void {
58155823 .return_type = .{ .Explicit = &type_of.base },
58165824 }, .{
58175825 .visib_token = pub_tok,
5818 .extern_export_inline_token = inline_tok,
58195826 .name_token = name_tok,
58205827 .body_node = block_node,
5828 .callconv_expr = callconv_expr,
58215829 });
58225830 mem.copy(ast.Node.FnProto.ParamDecl, fn_proto.params(), fn_params.items);
58235831