authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-06 17:54:16-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-06 17:54:16-05:00
log5ada610e098b8f4ada2c64c2e0a7b93bd7a5f9b0
treea0de43a100f72ad8e60619136754a763bae16127
parent3b5c71d2a501e1423d064ca9a2300e2e898a4fd4
signaturelock-open Commit is signed but in an unrecognized format.

update translate-c and tests for new extern/callconv syntax

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

src-self-hosted/translate_c.zig+2-2
......@@ -4195,7 +4195,7 @@ fn finishTransFnProto(
41954195 is_pub: bool,
41964196) !*ast.Node.FnProto {
41974197 const is_export = if (fn_decl_context) |ctx| ctx.is_export else false;
4198 const is_extern = if (fn_decl_context) |ctx| !ctx.has_body else true;
4198 const is_extern = if (fn_decl_context) |ctx| !ctx.has_body else false;
41994199
42004200 // TODO check for always_inline attribute
42014201 // TODO check for align attribute
......@@ -4308,7 +4308,7 @@ fn finishTransFnProto(
43084308 break :blk null;
43094309 };
43104310
4311 const callconv_expr = if (extern_export_inline_tok != null) null else blk: {
4311 const callconv_expr = if ((is_export or is_extern) and cc == .C) null else blk: {
43124312 _ = try appendToken(rp.c, .Keyword_callconv, "callconv");
43134313 _ = try appendToken(rp.c, .LParen, "(");
43144314 const expr = try transCreateNodeEnumLiteral(rp.c, @tagName(cc));
test/translate_c.zig+12-12
......@@ -295,9 +295,9 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
295295 \\ lws_callback_function *callback_http;
296296 \\};
297297 , &[_][]const u8{
298 \\pub const lws_callback_function = extern fn () void;
298 \\pub const lws_callback_function = fn () callconv(.C) void;
299299 \\pub const struct_Foo = extern struct {
300 \\ func: ?extern fn () void,
300 \\ func: ?fn () callconv(.C) void,
301301 \\ callback_http: ?lws_callback_function,
302302 \\};
303303 });
......@@ -377,7 +377,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
377377 \\};
378378 , &[_][]const u8{
379379 \\pub const struct_Foo = extern struct {
380 \\ derp: ?extern fn ([*c]struct_Foo) void,
380 \\ derp: ?fn ([*c]struct_Foo) callconv(.C) void,
381381 \\};
382382 ,
383383 \\pub const Foo = struct_Foo;
......@@ -611,7 +611,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
611611 cases.add("__cdecl doesn't mess up function pointers",
612612 \\void foo(void (__cdecl *fn_ptr)(void));
613613 , &[_][]const u8{
614 \\pub extern fn foo(fn_ptr: ?extern fn () void) void;
614 \\pub extern fn foo(fn_ptr: ?fn () callconv(.C) void) void;
615615 });
616616
617617 cases.add("void cast",
......@@ -953,8 +953,8 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
953953 \\typedef void (*fn0)();
954954 \\typedef void (*fn1)(char);
955955 , &[_][]const u8{
956 \\pub const fn0 = ?extern fn (...) void;
957 \\pub const fn1 = ?extern fn (u8) void;
956 \\pub const fn0 = ?fn (...) callconv(.C) void;
957 \\pub const fn1 = ?fn (u8) callconv(.C) void;
958958 });
959959
960960 cases.addWithTarget("Calling convention", tests.Target{
......@@ -1157,13 +1157,13 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
11571157 \\extern char (*fn_ptr2)(int, float);
11581158 \\#define bar fn_ptr2
11591159 , &[_][]const u8{
1160 \\pub extern var fn_ptr: ?extern fn () void;
1160 \\pub extern var fn_ptr: ?fn () callconv(.C) void;
11611161 ,
11621162 \\pub inline fn foo() void {
11631163 \\ return fn_ptr.?();
11641164 \\}
11651165 ,
1166 \\pub extern var fn_ptr2: ?extern fn (c_int, f32) u8;
1166 \\pub extern var fn_ptr2: ?fn (c_int, f32) callconv(.C) u8;
11671167 ,
11681168 \\pub inline fn bar(arg_1: c_int, arg_2: f32) u8 {
11691169 \\ return fn_ptr2.?(arg_1, arg_2);
......@@ -1185,8 +1185,8 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
11851185 \\#define glClearPFN PFNGLCLEARPROC
11861186 , &[_][]const u8{
11871187 \\pub const GLbitfield = c_uint;
1188 \\pub const PFNGLCLEARPROC = ?extern fn (GLbitfield) void;
1189 \\pub const OpenGLProc = ?extern fn () void;
1188 \\pub const PFNGLCLEARPROC = ?fn (GLbitfield) callconv(.C) void;
1189 \\pub const OpenGLProc = ?fn () callconv(.C) void;
11901190 \\const struct_unnamed_1 = extern struct {
11911191 \\ Clear: PFNGLCLEARPROC,
11921192 \\};
......@@ -1976,8 +1976,8 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
19761976 \\ return 0;
19771977 \\}
19781978 \\pub export fn bar() void {
1979 \\ var f: ?extern fn () void = foo;
1980 \\ var b: ?extern fn () c_int = baz;
1979 \\ var f: ?fn () callconv(.C) void = foo;
1980 \\ var b: ?fn () callconv(.C) c_int = baz;
19811981 \\ f.?();
19821982 \\ (f).?();
19831983 \\ foo();