authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-05-16 13:05:43+03:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-05-16 13:05:43+03:00
log5ac684ec502096196f05a1c6ed1841b886d6db92
tree07c106504da9fc77872fda4133a62ea0cb4cfed2
parenta05011d403d084d75b3a3d8a5a38fa0a4bfe3380
signaturelock-open Commit is signed but in an unrecognized format.

fix building translate-c

1 files changed, 5 insertions(+), 9 deletions(-)

src-self-hosted/translate_c.zig+5-9
......@@ -501,7 +501,7 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
501501 const param = @fieldParentPtr(ast.Node.ParamDecl, "base", p.*);
502502 const param_name = if (param.name_token) |name_tok|
503503 tokenSlice(c, name_tok)
504 else if (param.var_args_token != null) {
504 else if (param.param_type == .var_args) {
505505 assert(it.next() == null);
506506 _ = proto_node.params.pop();
507507 break;
......@@ -4103,8 +4103,7 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a
41034103 .comptime_token = null,
41044104 .noalias_token = param.noalias_token,
41054105 .name_token = param_name_tok,
4106 .type_node = param.type_node,
4107 .var_args_token = null,
4106 .param_type = param.param_type,
41084107 };
41094108 try fn_params.push(&param_node.base);
41104109 }
......@@ -4678,8 +4677,7 @@ fn finishTransFnProto(
46784677 .comptime_token = null,
46794678 .noalias_token = noalias_tok,
46804679 .name_token = param_name_tok,
4681 .type_node = type_node,
4682 .var_args_token = null,
4680 .param_type = .{ .type_expr = type_node },
46834681 };
46844682 try fn_params.push(&param_node.base);
46854683
......@@ -4699,8 +4697,7 @@ fn finishTransFnProto(
46994697 .comptime_token = null,
47004698 .noalias_token = null,
47014699 .name_token = null,
4702 .type_node = undefined, // Note: Accessing this causes an access violation. Need to check .var_args_token first before trying this field
4703 .var_args_token = try appendToken(rp.c, .Ellipsis3, "..."),
4700 .param_type = .{ .var_args = try appendToken(rp.c, .Ellipsis3, "...") }
47044701 };
47054702 try fn_params.push(&var_arg_node.base);
47064703 }
......@@ -5108,8 +5105,7 @@ fn transMacroFnDefine(c: *Context, it: *CTokenList.Iterator, source: []const u8,
51085105 .comptime_token = null,
51095106 .noalias_token = null,
51105107 .name_token = param_name_tok,
5111 .type_node = &identifier.base,
5112 .var_args_token = null,
5108 .param_type = .{ .type_expr = &identifier.base },
51135109 };
51145110 try fn_params.push(&param_node.base);
51155111