aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLemonBoy <thatlemon@gmail.com>2020-02-18 22:39:19 +0100
committerAndrew Kelley <andrew@ziglang.org>2020-02-18 18:18:15 -0500
commit95a71e29f84573ce72b16406eaf1a6dff96de35f (patch)
treeb57f0ed600b2fe270d6d4c010b0c9d88ac0221ad /lib
parentccca4b5a5e98dd96aaeb365af6c1cfbe87dca181 (diff)
downloadzig-95a71e29f84573ce72b16406eaf1a6dff96de35f.tar.gz
zig-95a71e29f84573ce72b16406eaf1a6dff96de35f.zip
zig fmt: Fix callconv rewriting for extern + string
Closes #4473
Diffstat (limited to 'lib')
-rw-r--r--lib/std/zig/parser_test.zig2
-rw-r--r--lib/std/zig/render.zig1
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
index 28bf0c9ed5..5f28dd3b06 100644
--- a/lib/std/zig/parser_test.zig
+++ b/lib/std/zig/parser_test.zig
@@ -92,10 +92,12 @@ test "zig fmt: convert extern/nakedcc/stdcallcc into callconv(...)" {
\\nakedcc fn foo1() void {}
\\stdcallcc fn foo2() void {}
\\extern fn foo3() void {}
+ \\extern "mylib" fn foo4() void {}
,
\\fn foo1() callconv(.Naked) void {}
\\fn foo2() callconv(.Stdcall) void {}
\\fn foo3() callconv(.C) void {}
+ \\fn foo4() callconv(.C) void {}
\\
);
}
diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig
index e322a91dc4..069635d42e 100644
--- a/lib/std/zig/render.zig
+++ b/lib/std/zig/render.zig
@@ -1396,6 +1396,7 @@ fn renderExpression(
try renderToken(tree, stream, extern_export_inline_token, indent, start_col, Space.Space); // extern/export
} else {
cc_rewrite_str = ".C";
+ fn_proto.lib_name = null;
}
}