authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-19 02:39:43-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-19 02:39:43-05:00
log9d9201c3b48873e432dc6824d42b5ca96b236daa
treebdc43bc1b664450fee07884e59106a24b72aa2cd
parent27ba4f0baf5168b2fb8f0dd72b04f528092f075a

bring back code that uses export and fix tests

partial revert of 1fdebc1dc4881a00766f7c2b4b2d8ee6ad6e79b6

19 files changed, 443 insertions(+), 698 deletions(-)

doc/langref.html.in+6
......@@ -136,6 +136,7 @@
136136 <li><a href="#builtin-divFloor">@divFloor</a></li>
137137 <li><a href="#builtin-divTrunc">@divTrunc</a></li>
138138 <li><a href="#builtin-embedFile">@embedFile</a></li>
139 <li><a href="#builtin-export">@export</a></li>
139140 <li><a href="#builtin-tagName">@tagName</a></li>
140141 <li><a href="#builtin-EnumTagType">@EnumTagType</a></li>
141142 <li><a href="#builtin-errorName">@errorName</a></li>
......@@ -4368,6 +4369,11 @@ test.zig:6:2: error: found compile log statement
43684369 <ul>
43694370 <li><a href="#builtin-import">@import</a></li>
43704371 </ul>
4372 <h3 id="builtin-export">@export</h3>
4373 <pre><code class="zig">@export(comptime name: []const u8, target: var, linkage: builtin.GlobalLinkage) -&gt; []const u8</code></pre>
4374 <p>
4375 Creates a symbol in the output object file.
4376 </p>
43714377 <h3 id="builtin-tagName">@tagName</h3>
43724378 <pre><code class="zig">@tagName(value: var) -&gt; []const u8</code></pre>
43734379 <p>
example/hello_world/hello_libc.zig+2-6
......@@ -5,13 +5,9 @@ const c = @cImport({
55 @cInclude("string.h");
66});
77
8comptime {
9 @export("main", main);
10}
11
12extern fn main(argc: c_int, argv: &&u8) -> c_int {
13 const msg = c"Hello, world!\n";
8const msg = c"Hello, world!\n";
149
10export fn main(argc: c_int, argv: &&u8) -> c_int {
1511 if (c.printf(msg) != c_int(c.strlen(msg)))
1612 return -1;
1713
example/mix_o_files/base64.zig+1-4
......@@ -1,9 +1,6 @@
11const base64 = @import("std").base64;
22
3comptime {
4 @export("decode_base_64", decode_base_64);
5}
6extern fn decode_base_64(dest_ptr: &u8, dest_len: usize, source_ptr: &const u8, source_len: usize) -> usize {
3export fn decode_base_64(dest_ptr: &u8, dest_len: usize, source_ptr: &const u8, source_len: usize) -> usize {
74 const src = source_ptr[0..source_len];
85 const dest = dest_ptr[0..dest_len];
96 const base64_decoder = base64.standard_decoder_unsafe;
example/shared_library/mathtest.zig+1-4
......@@ -1,6 +1,3 @@
1comptime {
2 @export("add", add);
3}
4extern fn add(a: i32, b: i32) -> i32 {
1export fn add(a: i32, b: i32) -> i32 {
52 a + b
63}
src/all_types.hpp-1
......@@ -1285,7 +1285,6 @@ enum BuiltinFnId {
12851285 BuiltinFnIdSetAlignStack,
12861286 BuiltinFnIdArgType,
12871287 BuiltinFnIdExport,
1288 BuiltinFnIdExportWithLinkage,
12891288};
12901289
12911290struct BuiltinFnEntry {
src/ast_render.cpp+6-1
......@@ -111,6 +111,10 @@ static const char *extern_string(bool is_extern) {
111111 return is_extern ? "extern " : "";
112112}
113113
114static const char *export_string(bool is_export) {
115 return is_export ? "export " : "";
116}
117
114118//static const char *calling_convention_string(CallingConvention cc) {
115119// switch (cc) {
116120// case CallingConventionUnspecified: return "";
......@@ -410,8 +414,9 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) {
410414 {
411415 const char *pub_str = visib_mod_string(node->data.fn_proto.visib_mod);
412416 const char *extern_str = extern_string(node->data.fn_proto.is_extern);
417 const char *export_str = export_string(node->data.fn_proto.is_export);
413418 const char *inline_str = inline_string(node->data.fn_proto.is_inline);
414 fprintf(ar->f, "%s%s%sfn", pub_str, inline_str, extern_str);
419 fprintf(ar->f, "%s%s%s%sfn", pub_str, inline_str, export_str, extern_str);
415420 if (node->data.fn_proto.name != nullptr) {
416421 fprintf(ar->f, " ");
417422 print_symbol(ar, node->data.fn_proto.name);
src/codegen.cpp+1-2
......@@ -5016,8 +5016,7 @@ static void define_builtin_fns(CodeGen *g) {
50165016 create_builtin_fn(g, BuiltinFnIdOpaqueType, "OpaqueType", 0);
50175017 create_builtin_fn(g, BuiltinFnIdSetAlignStack, "setAlignStack", 1);
50185018 create_builtin_fn(g, BuiltinFnIdArgType, "ArgType", 2);
5019 create_builtin_fn(g, BuiltinFnIdExport, "export", 2);
5020 create_builtin_fn(g, BuiltinFnIdExportWithLinkage, "exportWithLinkage", 3);
5019 create_builtin_fn(g, BuiltinFnIdExport, "export", 3);
50215020}
50225021
50235022static const char *bool_to_str(bool b) {
src/ir.cpp+4-10
......@@ -4739,7 +4739,6 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo
47394739 return ir_build_arg_type(irb, scope, node, arg0_value, arg1_value);
47404740 }
47414741 case BuiltinFnIdExport:
4742 case BuiltinFnIdExportWithLinkage:
47434742 {
47444743 AstNode *arg0_node = node->data.fn_call_expr.params.at(0);
47454744 IrInstruction *arg0_value = ir_gen_node(irb, arg0_node, scope);
......@@ -4751,15 +4750,10 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo
47514750 if (arg1_value == irb->codegen->invalid_instruction)
47524751 return arg1_value;
47534752
4754 IrInstruction *arg2_value;
4755 if (builtin_fn->id == BuiltinFnIdExportWithLinkage) {
4756 AstNode *arg2_node = node->data.fn_call_expr.params.at(2);
4757 arg2_value = ir_gen_node(irb, arg2_node, scope);
4758 if (arg2_value == irb->codegen->invalid_instruction)
4759 return arg2_value;
4760 } else {
4761 arg2_value = nullptr;
4762 }
4753 AstNode *arg2_node = node->data.fn_call_expr.params.at(2);
4754 IrInstruction *arg2_value = ir_gen_node(irb, arg2_node, scope);
4755 if (arg2_value == irb->codegen->invalid_instruction)
4756 return arg2_value;
47634757
47644758 return ir_build_export(irb, scope, node, arg0_value, arg1_value, arg2_value);
47654759 }
src/parser.cpp+26-4
......@@ -740,9 +740,21 @@ static AstNode *ast_parse_primary_expr(ParseContext *pc, size_t *token_index, bo
740740 return node;
741741 } else if (token->id == TokenIdAtSign) {
742742 *token_index += 1;
743 Token *name_tok = ast_eat_token(pc, token_index, TokenIdSymbol);
743 Token *name_tok = &pc->tokens->at(*token_index);
744 Buf *name_buf;
745 if (name_tok->id == TokenIdKeywordExport) {
746 name_buf = buf_create_from_str("export");
747 *token_index += 1;
748 } else if (name_tok->id == TokenIdSymbol) {
749 name_buf = token_buf(name_tok);
750 *token_index += 1;
751 } else {
752 ast_expect_token(pc, name_tok, TokenIdSymbol);
753 zig_unreachable();
754 }
755
744756 AstNode *name_node = ast_create_node(pc, NodeTypeSymbol, name_tok);
745 name_node->data.symbol_expr.symbol = token_buf(name_tok);
757 name_node->data.symbol_expr.symbol = name_buf;
746758
747759 AstNode *node = ast_create_node(pc, NodeTypeFnCallExpr, token);
748760 node->data.fn_call_expr.fn_ref_expr = name_node;
......@@ -2254,12 +2266,22 @@ static AstNode *ast_parse_fn_proto(ParseContext *pc, size_t *token_index, bool m
22542266 fn_token = ast_eat_token(pc, token_index, TokenIdKeywordFn);
22552267 cc = CallingConventionStdcall;
22562268 } else if (first_token->id == TokenIdKeywordExtern) {
2269 is_extern = true;
22572270 *token_index += 1;
2258 fn_token = ast_eat_token(pc, token_index, TokenIdKeywordFn);
2271 Token *next_token = &pc->tokens->at(*token_index);
2272 if (next_token->id == TokenIdKeywordFn) {
2273 fn_token = next_token;
2274 *token_index += 1;
2275 } else if (mandatory) {
2276 ast_expect_token(pc, next_token, TokenIdKeywordFn);
2277 zig_unreachable();
2278 } else {
2279 *token_index -= 1;
2280 return nullptr;
2281 }
22592282 cc = CallingConventionC;
22602283 } else if (first_token->id == TokenIdKeywordFn) {
22612284 fn_token = first_token;
2262 is_extern = true;
22632285 *token_index += 1;
22642286 cc = CallingConventionUnspecified;
22652287 } else if (mandatory) {
src/translate_c.cpp+4-1
......@@ -73,6 +73,7 @@ struct Context {
7373 ImportTableEntry *import;
7474 ZigList<ErrorMsg *> *errors;
7575 VisibMod visib_mod;
76 bool want_export;
7677 AstNode *root;
7778 HashMap<const void *, AstNode *, ptr_hash, ptr_eq> decl_table;
7879 HashMap<Buf *, AstNode *, buf_hash, buf_eql_buf> macro_table;
......@@ -3250,8 +3251,8 @@ static void visit_fn_decl(Context *c, const FunctionDecl *fn_decl) {
32503251
32513252 StorageClass sc = fn_decl->getStorageClass();
32523253 if (sc == SC_None) {
3253 // TODO add export decl
32543254 proto_node->data.fn_proto.visib_mod = c->visib_mod;
3255 proto_node->data.fn_proto.is_export = fn_decl->hasBody() ? c->want_export : false;
32553256 } else if (sc == SC_Extern || sc == SC_Static) {
32563257 proto_node->data.fn_proto.visib_mod = c->visib_mod;
32573258 } else if (sc == SC_PrivateExtern) {
......@@ -4274,8 +4275,10 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch
42744275 c->errors = errors;
42754276 if (buf_ends_with_str(buf_create_from_str(target_file), ".h")) {
42764277 c->visib_mod = VisibModPub;
4278 c->want_export = false;
42774279 } else {
42784280 c->visib_mod = VisibModPub;
4281 c->want_export = true;
42794282 }
42804283 c->decl_table.init(8);
42814284 c->macro_table.init(8);
std/special/bootstrap.zig+4-3
......@@ -8,12 +8,13 @@ const builtin = @import("builtin");
88var argc_ptr: &usize = undefined;
99
1010comptime {
11 const strong_linkage = builtin.GlobalLinkage.Strong;
1112 if (builtin.link_libc) {
12 @export("main", main);
13 @export("main", main, strong_linkage);
1314 } else if (builtin.os == builtin.Os.windows) {
14 @export("WinMainCRTStartup", WinMainCRTStartup);
15 @export("WinMainCRTStartup", WinMainCRTStartup, strong_linkage);
1516 } else {
16 @export("_start", _start);
17 @export("_start", _start, strong_linkage);
1718 }
1819}
1920
std/special/builtin.zig+13-22
......@@ -13,24 +13,10 @@ pub coldcc fn panic(msg: []const u8) -> noreturn {
1313 }
1414}
1515
16comptime {
17 @export("memset", memset);
18 @export("memcpy", memcpy);
19 @export("fmodf", fmodf);
20 @export("fmod", fmod);
21 @export("floorf", floorf);
22 @export("ceilf", ceilf);
23 @export("floor", floor);
24 @export("ceil", ceil);
25 if (builtin.mode != builtin.Mode.ReleaseFast and builtin.os != builtin.Os.windows) {
26 @export("__stack_chk_fail", __stack_chk_fail);
27 }
28}
29
3016// Note that memset does not return `dest`, like the libc API.
3117// The semantics of memset is dictated by the corresponding
3218// LLVM intrinsics, not by the libc API.
33extern fn memset(dest: ?&u8, c: u8, n: usize) {
19export fn memset(dest: ?&u8, c: u8, n: usize) {
3420 @setDebugSafety(this, false);
3521
3622 var index: usize = 0;
......@@ -41,7 +27,7 @@ extern fn memset(dest: ?&u8, c: u8, n: usize) {
4127// Note that memcpy does not return `dest`, like the libc API.
4228// The semantics of memcpy is dictated by the corresponding
4329// LLVM intrinsics, not by the libc API.
44extern fn memcpy(noalias dest: ?&u8, noalias src: ?&const u8, n: usize) {
30export fn memcpy(noalias dest: ?&u8, noalias src: ?&const u8, n: usize) {
4531 @setDebugSafety(this, false);
4632
4733 var index: usize = 0;
......@@ -49,21 +35,26 @@ extern fn memcpy(noalias dest: ?&u8, noalias src: ?&const u8, n: usize) {
4935 (??dest)[index] = (??src)[index];
5036}
5137
38comptime {
39 if (builtin.mode != builtin.Mode.ReleaseFast and builtin.os != builtin.Os.windows) {
40 @export("__stack_chk_fail", __stack_chk_fail, builtin.GlobalLinkage.Strong);
41 }
42}
5243extern fn __stack_chk_fail() -> noreturn {
5344 @panic("stack smashing detected");
5445}
5546
5647const math = @import("../math/index.zig");
5748
58extern fn fmodf(x: f32, y: f32) -> f32 { generic_fmod(f32, x, y) }
59extern fn fmod(x: f64, y: f64) -> f64 { generic_fmod(f64, x, y) }
49export fn fmodf(x: f32, y: f32) -> f32 { generic_fmod(f32, x, y) }
50export fn fmod(x: f64, y: f64) -> f64 { generic_fmod(f64, x, y) }
6051
6152// TODO add intrinsics for these (and probably the double version too)
6253// and have the math stuff use the intrinsic. same as @mod and @rem
63extern fn floorf(x: f32) -> f32 { math.floor(x) }
64extern fn ceilf(x: f32) -> f32 { math.ceil(x) }
65extern fn floor(x: f64) -> f64 { math.floor(x) }
66extern fn ceil(x: f64) -> f64 { math.ceil(x) }
54export fn floorf(x: f32) -> f32 { math.floor(x) }
55export fn ceilf(x: f32) -> f32 { math.ceil(x) }
56export fn floor(x: f64) -> f64 { math.floor(x) }
57export fn ceil(x: f64) -> f64 { math.ceil(x) }
6758
6859fn generic_fmod(comptime T: type, x: T, y: T) -> T {
6960 @setDebugSafety(this, false);
std/special/compiler_rt/index.zig+34-34
......@@ -5,62 +5,62 @@ comptime {
55 const linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Weak;
66 const strong_linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Strong;
77
8 @exportWithLinkage("__letf2", @import("comparetf2.zig").__letf2, linkage);
9 @exportWithLinkage("__getf2", @import("comparetf2.zig").__getf2, linkage);
8 @export("__letf2", @import("comparetf2.zig").__letf2, linkage);
9 @export("__getf2", @import("comparetf2.zig").__getf2, linkage);
1010
1111 if (!is_test) {
1212 // only create these aliases when not testing
13 @exportWithLinkage("__cmptf2", @import("comparetf2.zig").__letf2, linkage);
14 @exportWithLinkage("__eqtf2", @import("comparetf2.zig").__letf2, linkage);
15 @exportWithLinkage("__lttf2", @import("comparetf2.zig").__letf2, linkage);
16 @exportWithLinkage("__netf2", @import("comparetf2.zig").__letf2, linkage);
17 @exportWithLinkage("__gttf2", @import("comparetf2.zig").__getf2, linkage);
13 @export("__cmptf2", @import("comparetf2.zig").__letf2, linkage);
14 @export("__eqtf2", @import("comparetf2.zig").__letf2, linkage);
15 @export("__lttf2", @import("comparetf2.zig").__letf2, linkage);
16 @export("__netf2", @import("comparetf2.zig").__letf2, linkage);
17 @export("__gttf2", @import("comparetf2.zig").__getf2, linkage);
1818 }
1919
20 @exportWithLinkage("__unordtf2", @import("comparetf2.zig").__unordtf2, linkage);
20 @export("__unordtf2", @import("comparetf2.zig").__unordtf2, linkage);
2121
22 @exportWithLinkage("__fixunssfsi", @import("fixunssfsi.zig").__fixunssfsi, linkage);
23 @exportWithLinkage("__fixunssfdi", @import("fixunssfdi.zig").__fixunssfdi, linkage);
24 @exportWithLinkage("__fixunssfti", @import("fixunssfti.zig").__fixunssfti, linkage);
22 @export("__fixunssfsi", @import("fixunssfsi.zig").__fixunssfsi, linkage);
23 @export("__fixunssfdi", @import("fixunssfdi.zig").__fixunssfdi, linkage);
24 @export("__fixunssfti", @import("fixunssfti.zig").__fixunssfti, linkage);
2525
26 @exportWithLinkage("__fixunsdfsi", @import("fixunsdfsi.zig").__fixunsdfsi, linkage);
27 @exportWithLinkage("__fixunsdfdi", @import("fixunsdfdi.zig").__fixunsdfdi, linkage);
28 @exportWithLinkage("__fixunsdfti", @import("fixunsdfti.zig").__fixunsdfti, linkage);
26 @export("__fixunsdfsi", @import("fixunsdfsi.zig").__fixunsdfsi, linkage);
27 @export("__fixunsdfdi", @import("fixunsdfdi.zig").__fixunsdfdi, linkage);
28 @export("__fixunsdfti", @import("fixunsdfti.zig").__fixunsdfti, linkage);
2929
30 @exportWithLinkage("__fixunstfsi", @import("fixunstfsi.zig").__fixunstfsi, linkage);
31 @exportWithLinkage("__fixunstfdi", @import("fixunstfdi.zig").__fixunstfdi, linkage);
32 @exportWithLinkage("__fixunstfti", @import("fixunstfti.zig").__fixunstfti, linkage);
30 @export("__fixunstfsi", @import("fixunstfsi.zig").__fixunstfsi, linkage);
31 @export("__fixunstfdi", @import("fixunstfdi.zig").__fixunstfdi, linkage);
32 @export("__fixunstfti", @import("fixunstfti.zig").__fixunstfti, linkage);
3333
34 @exportWithLinkage("__udivmoddi4", @import("udivmoddi4.zig").__udivmoddi4, linkage);
35 @exportWithLinkage("__udivmodti4", @import("udivmodti4.zig").__udivmodti4, linkage);
34 @export("__udivmoddi4", @import("udivmoddi4.zig").__udivmoddi4, linkage);
35 @export("__udivmodti4", @import("udivmodti4.zig").__udivmodti4, linkage);
3636
37 @exportWithLinkage("__udivti3", @import("udivti3.zig").__udivti3, linkage);
38 @exportWithLinkage("__umodti3", @import("umodti3.zig").__umodti3, linkage);
37 @export("__udivti3", @import("udivti3.zig").__udivti3, linkage);
38 @export("__umodti3", @import("umodti3.zig").__umodti3, linkage);
3939
40 @exportWithLinkage("__udivsi3", __udivsi3, linkage);
41 @exportWithLinkage("__udivdi3", __udivdi3, linkage);
42 @exportWithLinkage("__umoddi3", __umoddi3, linkage);
43 @exportWithLinkage("__udivmodsi4", __udivmodsi4, linkage);
40 @export("__udivsi3", __udivsi3, linkage);
41 @export("__udivdi3", __udivdi3, linkage);
42 @export("__umoddi3", __umoddi3, linkage);
43 @export("__udivmodsi4", __udivmodsi4, linkage);
4444
4545 if (isArmArch()) {
46 @exportWithLinkage("__aeabi_uldivmod", __aeabi_uldivmod, linkage);
47 @exportWithLinkage("__aeabi_uidivmod", __aeabi_uidivmod, linkage);
48 @exportWithLinkage("__aeabi_uidiv", __udivsi3, linkage);
46 @export("__aeabi_uldivmod", __aeabi_uldivmod, linkage);
47 @export("__aeabi_uidivmod", __aeabi_uidivmod, linkage);
48 @export("__aeabi_uidiv", __udivsi3, linkage);
4949 }
5050 if (builtin.os == builtin.Os.windows) {
5151 switch (builtin.arch) {
5252 builtin.Arch.i386 => {
5353 if (!builtin.link_libc) {
54 @exportWithLinkage("_chkstk", _chkstk, strong_linkage);
55 @exportWithLinkage("__chkstk_ms", __chkstk_ms, linkage);
54 @export("_chkstk", _chkstk, strong_linkage);
55 @export("__chkstk_ms", __chkstk_ms, linkage);
5656 }
57 @exportWithLinkage("_aulldiv", @import("aulldiv.zig")._aulldiv, strong_linkage);
58 @exportWithLinkage("_aullrem", @import("aullrem.zig")._aullrem, strong_linkage);
57 @export("_aulldiv", @import("aulldiv.zig")._aulldiv, strong_linkage);
58 @export("_aullrem", @import("aullrem.zig")._aullrem, strong_linkage);
5959 },
6060 builtin.Arch.x86_64 => {
6161 if (!builtin.link_libc) {
62 @exportWithLinkage("__chkstk", __chkstk, strong_linkage);
63 @exportWithLinkage("___chkstk_ms", ___chkstk_ms, linkage);
62 @export("__chkstk", __chkstk, strong_linkage);
63 @export("___chkstk_ms", ___chkstk_ms, linkage);
6464 }
6565 },
6666 else => {},
test/cases/asm.zig+6-7
......@@ -2,24 +2,23 @@ const config = @import("builtin");
22const assert = @import("std").debug.assert;
33
44comptime {
5 @export("derp", derp);
65 if (config.arch == config.Arch.x86_64 and config.os == config.Os.linux) {
76 asm volatile (
8 \\.globl my_aoeu_symbol_asdf;
9 \\.type my_aoeu_symbol_asdf, @function;
10 \\.set my_aoeu_symbol_asdf, derp;
7 \\.globl aoeu;
8 \\.type aoeu, @function;
9 \\.set aoeu, derp;
1110 );
1211 }
1312}
1413
1514test "module level assembly" {
1615 if (config.arch == config.Arch.x86_64 and config.os == config.Os.linux) {
17 assert(my_aoeu_symbol_asdf() == 1234);
16 assert(aoeu() == 1234);
1817 }
1918}
2019
21extern fn my_aoeu_symbol_asdf() -> i32;
20extern fn aoeu() -> i32;
2221
23extern fn derp() -> i32 {
22export fn derp() -> i32 {
2423 return 1234;
2524}
test/cases/misc.zig+3-17
......@@ -13,8 +13,9 @@ test "empty function with comments" {
1313}
1414
1515comptime {
16 @exportWithLinkage("disabledExternFn", disabledExternFn, builtin.GlobalLinkage.Internal)
16 @export("disabledExternFn", disabledExternFn, builtin.GlobalLinkage.Internal);
1717}
18
1819extern fn disabledExternFn() {
1920}
2021
......@@ -535,10 +536,7 @@ var global_ptr = &gdt[0];
535536// can't really run this test but we can make sure it has no compile error
536537// and generates code
537538const vram = @intToPtr(&volatile u8, 0x20000000)[0..0x8000];
538comptime {
539 @export("writeToVRam", writeToVRam);
540}
541extern fn writeToVRam() {
539export fn writeToVRam() {
542540 vram[0] = 'X';
543541}
544542
......@@ -562,15 +560,3 @@ fn hereIsAnOpaqueType(ptr: &OpaqueA) -> &OpaqueA {
562560 var a = ptr;
563561 return a;
564562}
565
566test "function and variable in weird section" {
567 if (builtin.os == builtin.Os.linux or builtin.os == builtin.Os.windows) {
568 // macos can't handle this
569 assert(fnInWeirdSection() == 1234);
570 }
571}
572
573var varInWeirdSection: i32 section(".data2") = 1234;
574fn fnInWeirdSection() section(".text2") -> i32 {
575 return varInWeirdSection;
576}
test/compare_output.zig+5-11
......@@ -4,8 +4,7 @@ const tests = @import("tests.zig");
44pub fn addCases(cases: &tests.CompareOutputContext) {
55 cases.addC("hello world with libc",
66 \\const c = @cImport(@cInclude("stdio.h"));
7 \\comptime { @export("main", main); }
8 \\extern fn main(argc: c_int, argv: &&u8) -> c_int {
7 \\export fn main(argc: c_int, argv: &&u8) -> c_int {
98 \\ _ = c.puts(c"Hello, world!");
109 \\ return 0;
1110 \\}
......@@ -138,8 +137,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
138137 \\ @cInclude("stdio.h");
139138 \\});
140139 \\
141 \\comptime { @export("main", main); }
142 \\extern fn main(argc: c_int, argv: &&u8) -> c_int {
140 \\export fn main(argc: c_int, argv: &&u8) -> c_int {
143141 \\ if (is_windows) {
144142 \\ // we want actual \n, not \r\n
145143 \\ _ = c._setmode(1, c._O_BINARY);
......@@ -284,10 +282,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
284282 cases.addC("expose function pointer to C land",
285283 \\const c = @cImport(@cInclude("stdlib.h"));
286284 \\
287 \\comptime {
288 \\ @export("main", main);
289 \\}
290 \\extern fn compare_fn(a: ?&const c_void, b: ?&const c_void) -> c_int {
285 \\export fn compare_fn(a: ?&const c_void, b: ?&const c_void) -> c_int {
291286 \\ const a_int = @ptrCast(&align(1) i32, a ?? unreachable);
292287 \\ const b_int = @ptrCast(&align(1) i32, b ?? unreachable);
293288 \\ if (*a_int < *b_int) {
......@@ -299,7 +294,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
299294 \\ }
300295 \\}
301296 \\
302 \\extern fn main() -> c_int {
297 \\export fn main() -> c_int {
303298 \\ var array = []u32 { 1, 7, 3, 2, 0, 9, 4, 8, 6, 5 };
304299 \\
305300 \\ c.qsort(@ptrCast(&c_void, &array[0]), c_ulong(array.len), @sizeOf(i32), compare_fn);
......@@ -327,8 +322,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
327322 \\ @cInclude("stdio.h");
328323 \\});
329324 \\
330 \\comptime { @export("main", main); }
331 \\extern fn main(argc: c_int, argv: &&u8) -> c_int {
325 \\export fn main(argc: c_int, argv: &&u8) -> c_int {
332326 \\ if (is_windows) {
333327 \\ // we want actual \n, not \r\n
334328 \\ _ = c._setmode(1, c._O_BINARY);
test/compile_errors.zig+294-535
......@@ -1,328 +1,253 @@
11const tests = @import("tests.zig");
22
33pub fn addCases(cases: &tests.CompileErrorContext) {
4 cases.add("wrong return type for main",
5 \\pub fn main() { }
6 , ".tmp_source.zig:1:15: error: expected return type of main to be '%void', instead is 'void'");
7
8 cases.add("double ?? on main return value",
9 \\pub fn main() -> ??void {
10 \\}
11 , ".tmp_source.zig:1:18: error: expected return type of main to be '%void', instead is '??void'");
12
13 cases.add("setting a section on an extern variable",
14 \\extern var foo: i32 section(".text2");
15 \\extern fn entry() -> i32 {
16 \\ return foo;
17 \\}
18 \\comptime { @export("entry", entry); }
19 ,
20 ".tmp_source.zig:1:29: error: cannot set section of external variable 'foo'");
21
22 cases.add("setting a section on a local variable",
23 \\extern fn entry() -> i32 {
24 \\ var foo: i32 section(".text2") = 1234;
25 \\ return foo;
26 \\}
27 \\comptime { @export("entry", entry); }
28 ,
29 ".tmp_source.zig:2:26: error: cannot set section of local variable 'foo'");
30
31 cases.add("setting a section on an extern fn",
32 \\extern fn foo() section(".text2");
33 \\extern fn entry() {
34 \\ foo();
35 \\}
36 \\comptime { @export("entry", entry); }
37 ,
38 ".tmp_source.zig:1:25: error: cannot set section of external function 'foo'");
39
40 cases.add("wrong types given to exportWithLinkage",
41 \\extern fn entry() { }
42 \\comptime {
43 \\ @exportWithLinkage("entry", entry, u32(1234));
44 \\}
45 ,
46 ".tmp_source.zig:3:43: error: expected type 'GlobalLinkage', found 'u32'");
47
484 cases.add("implicit semicolon - block statement",
49 \\extern fn entry() {
5 \\export fn entry() {
506 \\ {}
517 \\ var good = {};
528 \\ ({})
539 \\ var bad = {};
5410 \\}
55 \\comptime {@export("entry", entry);}
5611 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
5712
5813 cases.add("implicit semicolon - block expr",
59 \\extern fn entry() {
14 \\export fn entry() {
6015 \\ _ = {};
6116 \\ var good = {};
6217 \\ _ = {}
6318 \\ var bad = {};
6419 \\}
65 \\comptime {@export("entry", entry);}
6620 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
6721
6822 cases.add("implicit semicolon - comptime statement",
69 \\extern fn entry() {
23 \\export fn entry() {
7024 \\ comptime {}
7125 \\ var good = {};
7226 \\ comptime ({})
7327 \\ var bad = {};
7428 \\}
75 \\comptime {@export("entry", entry);}
7629 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
7730
7831 cases.add("implicit semicolon - comptime expression",
79 \\extern fn entry() {
32 \\export fn entry() {
8033 \\ _ = comptime {};
8134 \\ var good = {};
8235 \\ _ = comptime {}
8336 \\ var bad = {};
8437 \\}
85 \\comptime {@export("entry", entry);}
8638 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
8739
8840 cases.add("implicit semicolon - defer",
89 \\extern fn entry() {
41 \\export fn entry() {
9042 \\ defer {}
9143 \\ var good = {};
9244 \\ defer ({})
9345 \\ var bad = {};
9446 \\}
95 \\comptime {@export("entry", entry);}
9647 , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
9748
9849 cases.add("implicit semicolon - if statement",
99 \\extern fn entry() {
50 \\export fn entry() {
10051 \\ if(true) {}
10152 \\ var good = {};
10253 \\ if(true) ({})
10354 \\ var bad = {};
10455 \\}
105 \\comptime {@export("entry", entry);}
10656 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
10757
10858 cases.add("implicit semicolon - if expression",
109 \\extern fn entry() {
59 \\export fn entry() {
11060 \\ _ = if(true) {};
11161 \\ var good = {};
11262 \\ _ = if(true) {}
11363 \\ var bad = {};
11464 \\}
115 \\comptime {@export("entry", entry);}
11665 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
11766
11867 cases.add("implicit semicolon - if-else statement",
119 \\extern fn entry() {
68 \\export fn entry() {
12069 \\ if(true) {} else {}
12170 \\ var good = {};
12271 \\ if(true) ({}) else ({})
12372 \\ var bad = {};
12473 \\}
125 \\comptime {@export("entry", entry);}
12674 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
12775
12876 cases.add("implicit semicolon - if-else expression",
129 \\extern fn entry() {
77 \\export fn entry() {
13078 \\ _ = if(true) {} else {};
13179 \\ var good = {};
13280 \\ _ = if(true) {} else {}
13381 \\ var bad = {};
13482 \\}
135 \\comptime {@export("entry", entry);}
13683 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
13784
13885 cases.add("implicit semicolon - if-else-if statement",
139 \\extern fn entry() {
86 \\export fn entry() {
14087 \\ if(true) {} else if(true) {}
14188 \\ var good = {};
14289 \\ if(true) ({}) else if(true) ({})
14390 \\ var bad = {};
14491 \\}
145 \\comptime {@export("entry", entry);}
14692 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
14793
14894 cases.add("implicit semicolon - if-else-if expression",
149 \\extern fn entry() {
95 \\export fn entry() {
15096 \\ _ = if(true) {} else if(true) {};
15197 \\ var good = {};
15298 \\ _ = if(true) {} else if(true) {}
15399 \\ var bad = {};
154100 \\}
155 \\comptime {@export("entry", entry);}
156101 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
157102
158103 cases.add("implicit semicolon - if-else-if-else statement",
159 \\extern fn entry() {
104 \\export fn entry() {
160105 \\ if(true) {} else if(true) {} else {}
161106 \\ var good = {};
162107 \\ if(true) ({}) else if(true) ({}) else ({})
163108 \\ var bad = {};
164109 \\}
165 \\comptime {@export("entry", entry);}
166110 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
167111
168112 cases.add("implicit semicolon - if-else-if-else expression",
169 \\extern fn entry() {
113 \\export fn entry() {
170114 \\ _ = if(true) {} else if(true) {} else {};
171115 \\ var good = {};
172116 \\ _ = if(true) {} else if(true) {} else {}
173117 \\ var bad = {};
174118 \\}
175 \\comptime {@export("entry", entry);}
176119 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
177120
178121 cases.add("implicit semicolon - test statement",
179 \\extern fn entry() {
122 \\export fn entry() {
180123 \\ if (foo()) |_| {}
181124 \\ var good = {};
182125 \\ if (foo()) |_| ({})
183126 \\ var bad = {};
184127 \\}
185 \\comptime {@export("entry", entry);}
186128 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
187129
188130 cases.add("implicit semicolon - test expression",
189 \\extern fn entry() {
131 \\export fn entry() {
190132 \\ _ = if (foo()) |_| {};
191133 \\ var good = {};
192134 \\ _ = if (foo()) |_| {}
193135 \\ var bad = {};
194136 \\}
195 \\comptime {@export("entry", entry);}
196137 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
197138
198139 cases.add("implicit semicolon - while statement",
199 \\extern fn entry() {
140 \\export fn entry() {
200141 \\ while(true) {}
201142 \\ var good = {};
202143 \\ while(true) ({})
203144 \\ var bad = {};
204145 \\}
205 \\comptime {@export("entry", entry);}
206146 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
207147
208148 cases.add("implicit semicolon - while expression",
209 \\extern fn entry() {
149 \\export fn entry() {
210150 \\ _ = while(true) {};
211151 \\ var good = {};
212152 \\ _ = while(true) {}
213153 \\ var bad = {};
214154 \\}
215 \\comptime {@export("entry", entry);}
216155 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
217156
218157 cases.add("implicit semicolon - while-continue statement",
219 \\extern fn entry() {
158 \\export fn entry() {
220159 \\ while(true):({}) {}
221160 \\ var good = {};
222161 \\ while(true):({}) ({})
223162 \\ var bad = {};
224163 \\}
225 \\comptime {@export("entry", entry);}
226164 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
227165
228166 cases.add("implicit semicolon - while-continue expression",
229 \\extern fn entry() {
167 \\export fn entry() {
230168 \\ _ = while(true):({}) {};
231169 \\ var good = {};
232170 \\ _ = while(true):({}) {}
233171 \\ var bad = {};
234172 \\}
235 \\comptime {@export("entry", entry);}
236173 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
237174
238175 cases.add("implicit semicolon - for statement",
239 \\extern fn entry() {
176 \\export fn entry() {
240177 \\ for(foo()) {}
241178 \\ var good = {};
242179 \\ for(foo()) ({})
243180 \\ var bad = {};
244181 \\}
245 \\comptime {@export("entry", entry);}
246182 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
247183
248184 cases.add("implicit semicolon - for expression",
249 \\extern fn entry() {
185 \\export fn entry() {
250186 \\ _ = for(foo()) {};
251187 \\ var good = {};
252188 \\ _ = for(foo()) {}
253189 \\ var bad = {};
254190 \\}
255 \\comptime {@export("entry", entry);}
256191 , ".tmp_source.zig:5:5: error: invalid token: 'var'");
257192
258193 cases.add("multiple function definitions",
259194 \\fn a() {}
260195 \\fn a() {}
261 \\comptime {@export("entry", entry);}
262 \\extern fn entry() { a(); }
196 \\export fn entry() { a(); }
263197 , ".tmp_source.zig:2:1: error: redefinition of 'a'");
264198
265199 cases.add("unreachable with return",
266200 \\fn a() -> noreturn {return;}
267 \\comptime {@export("entry", entry);}
268 \\extern fn entry() { a(); }
201 \\export fn entry() { a(); }
269202 , ".tmp_source.zig:1:21: error: expected type 'noreturn', found 'void'");
270203
271204 cases.add("control reaches end of non-void function",
272205 \\fn a() -> i32 {}
273 \\comptime {@export("entry", entry);}
274 \\extern fn entry() { _ = a(); }
206 \\export fn entry() { _ = a(); }
275207 , ".tmp_source.zig:1:15: error: expected type 'i32', found 'void'");
276208
277209 cases.add("undefined function call",
278 \\extern fn a() {
210 \\export fn a() {
279211 \\ b();
280212 \\}
281 \\comptime {@export("a", a);}
282213 , ".tmp_source.zig:2:5: error: use of undeclared identifier 'b'");
283214
284215 cases.add("wrong number of arguments",
285 \\extern fn a() {
216 \\export fn a() {
286217 \\ b(1);
287218 \\}
288219 \\fn b(a: i32, b: i32, c: i32) { }
289 \\comptime {@export("a", a);}
290220 , ".tmp_source.zig:2:6: error: expected 3 arguments, found 1");
291221
292222 cases.add("invalid type",
293223 \\fn a() -> bogus {}
294 \\comptime {@export("entry", entry);}
295 \\extern fn entry() { _ = a(); }
224 \\export fn entry() { _ = a(); }
296225 , ".tmp_source.zig:1:11: error: use of undeclared identifier 'bogus'");
297226
298227 cases.add("pointer to unreachable",
299228 \\fn a() -> &noreturn {}
300 \\comptime {@export("entry", entry);}
301 \\extern fn entry() { _ = a(); }
229 \\export fn entry() { _ = a(); }
302230 , ".tmp_source.zig:1:12: error: pointer to unreachable not allowed");
303231
304232 cases.add("unreachable code",
305 \\extern fn a() {
233 \\export fn a() {
306234 \\ return;
307235 \\ b();
308236 \\}
309237 \\
310238 \\fn b() {}
311 \\comptime {@export("a", a);}
312239 , ".tmp_source.zig:3:5: error: unreachable code");
313240
314241 cases.add("bad import",
315242 \\const bogus = @import("bogus-does-not-exist.zig");
316 \\comptime {@export("entry", entry);}
317 \\extern fn entry() { bogus.bogo(); }
243 \\export fn entry() { bogus.bogo(); }
318244 , ".tmp_source.zig:1:15: error: unable to find 'bogus-does-not-exist.zig'");
319245
320246 cases.add("undeclared identifier",
321 \\extern fn a() {
247 \\export fn a() {
322248 \\ b +
323249 \\ c
324250 \\}
325 \\comptime {@export("a", a);}
326251 ,
327252 ".tmp_source.zig:2:5: error: use of undeclared identifier 'b'",
328253 ".tmp_source.zig:3:5: error: use of undeclared identifier 'c'");
......@@ -330,114 +255,99 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
330255 cases.add("parameter redeclaration",
331256 \\fn f(a : i32, a : i32) {
332257 \\}
333 \\comptime {@export("entry", entry);}
334 \\extern fn entry() { f(1, 2); }
258 \\export fn entry() { f(1, 2); }
335259 , ".tmp_source.zig:1:15: error: redeclaration of variable 'a'");
336260
337261 cases.add("local variable redeclaration",
338 \\extern fn f() {
262 \\export fn f() {
339263 \\ const a : i32 = 0;
340264 \\ const a = 0;
341265 \\}
342 \\comptime {@export("f", f);}
343266 , ".tmp_source.zig:3:5: error: redeclaration of variable 'a'");
344267
345268 cases.add("local variable redeclares parameter",
346269 \\fn f(a : i32) {
347270 \\ const a = 0;
348271 \\}
349 \\comptime {@export("entry", entry);}
350 \\extern fn entry() { f(1); }
272 \\export fn entry() { f(1); }
351273 , ".tmp_source.zig:2:5: error: redeclaration of variable 'a'");
352274
353275 cases.add("variable has wrong type",
354 \\extern fn f() -> i32 {
276 \\export fn f() -> i32 {
355277 \\ const a = c"a";
356278 \\ a
357279 \\}
358 \\comptime {@export("f", f);}
359280 , ".tmp_source.zig:3:5: error: expected type 'i32', found '&const u8'");
360281
361282 cases.add("if condition is bool, not int",
362 \\extern fn f() {
283 \\export fn f() {
363284 \\ if (0) {}
364285 \\}
365 \\comptime {@export("f", f);}
366286 , ".tmp_source.zig:2:9: error: integer value 0 cannot be implicitly casted to type 'bool'");
367287
368288 cases.add("assign unreachable",
369 \\extern fn f() {
289 \\export fn f() {
370290 \\ const a = return;
371291 \\}
372 \\comptime {@export("f", f);}
373292 , ".tmp_source.zig:2:5: error: unreachable code");
374293
375294 cases.add("unreachable variable",
376 \\extern fn f() {
295 \\export fn f() {
377296 \\ const a: noreturn = {};
378297 \\}
379 \\comptime {@export("f", f);}
380298 , ".tmp_source.zig:2:14: error: variable of type 'noreturn' not allowed");
381299
382300 cases.add("unreachable parameter",
383301 \\fn f(a: noreturn) {}
384 \\comptime {@export("entry", entry);}
385 \\extern fn entry() { f(); }
302 \\export fn entry() { f(); }
386303 , ".tmp_source.zig:1:9: error: parameter of type 'noreturn' not allowed");
387304
388305 cases.add("bad assignment target",
389 \\extern fn f() {
306 \\export fn f() {
390307 \\ 3 = 3;
391308 \\}
392 \\comptime {@export("f", f);}
393309 , ".tmp_source.zig:2:7: error: cannot assign to constant");
394310
395311 cases.add("assign to constant variable",
396 \\extern fn f() {
312 \\export fn f() {
397313 \\ const a = 3;
398314 \\ a = 4;
399315 \\}
400 \\comptime {@export("f", f);}
401316 , ".tmp_source.zig:3:7: error: cannot assign to constant");
402317
403318 cases.add("use of undeclared identifier",
404 \\extern fn f() {
319 \\export fn f() {
405320 \\ b = 3;
406321 \\}
407 \\comptime {@export("f", f);}
408322 , ".tmp_source.zig:2:5: error: use of undeclared identifier 'b'");
409323
410324 cases.add("const is a statement, not an expression",
411 \\extern fn f() {
325 \\export fn f() {
412326 \\ (const a = 0);
413327 \\}
414 \\comptime {@export("f", f);}
415328 , ".tmp_source.zig:2:6: error: invalid token: 'const'");
416329
417330 cases.add("array access of undeclared identifier",
418 \\extern fn f() {
331 \\export fn f() {
419332 \\ i[i] = i[i];
420333 \\}
421 \\comptime {@export("f", f);}
422334 , ".tmp_source.zig:2:5: error: use of undeclared identifier 'i'",
423335 ".tmp_source.zig:2:12: error: use of undeclared identifier 'i'");
424336
425337 cases.add("array access of non array",
426 \\extern fn f() {
338 \\export fn f() {
427339 \\ var bad : bool = undefined;
428340 \\ bad[bad] = bad[bad];
429341 \\}
430 \\comptime {@export("f", f);}
431342 , ".tmp_source.zig:3:8: error: array access of non-array type 'bool'",
432343 ".tmp_source.zig:3:19: error: array access of non-array type 'bool'");
433344
434345 cases.add("array access with non integer index",
435 \\extern fn f() {
346 \\export fn f() {
436347 \\ var array = "aoeu";
437348 \\ var bad = false;
438349 \\ array[bad] = array[bad];
439350 \\}
440 \\comptime {@export("f", f);}
441351 , ".tmp_source.zig:4:11: error: expected type 'usize', found 'bool'",
442352 ".tmp_source.zig:4:24: error: expected type 'usize', found 'bool'");
443353
......@@ -446,8 +356,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
446356 \\fn f() {
447357 \\ x = 1;
448358 \\}
449 \\extern fn entry() { f(); }
450 \\comptime {@export("entry", entry);}
359 \\export fn entry() { f(); }
451360 , ".tmp_source.zig:3:7: error: cannot assign to constant");
452361
453362
......@@ -456,33 +365,29 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
456365 \\ const x : i32 = if (b) { 1 };
457366 \\ const y = if (b) { i32(1) };
458367 \\}
459 \\extern fn entry() { f(true); }
460 \\comptime {@export("entry", entry);}
368 \\export fn entry() { f(true); }
461369 , ".tmp_source.zig:2:30: error: integer value 1 cannot be implicitly casted to type 'void'",
462370 ".tmp_source.zig:3:15: error: incompatible types: 'i32' and 'void'");
463371
464372 cases.add("direct struct loop",
465373 \\const A = struct { a : A, };
466 \\extern fn entry() -> usize { @sizeOf(A) }
467 \\comptime {@export("entry", entry);}
374 \\export fn entry() -> usize { @sizeOf(A) }
468375 , ".tmp_source.zig:1:11: error: struct 'A' contains itself");
469376
470377 cases.add("indirect struct loop",
471378 \\const A = struct { b : B, };
472379 \\const B = struct { c : C, };
473380 \\const C = struct { a : A, };
474 \\extern fn entry() -> usize { @sizeOf(A) }
475 \\comptime {@export("entry", entry);}
381 \\export fn entry() -> usize { @sizeOf(A) }
476382 , ".tmp_source.zig:1:11: error: struct 'A' contains itself");
477383
478384 cases.add("invalid struct field",
479385 \\const A = struct { x : i32, };
480 \\extern fn f() {
386 \\export fn f() {
481387 \\ var a : A = undefined;
482388 \\ a.foo = 1;
483389 \\ const y = a.bar;
484390 \\}
485 \\comptime {@export("f", f);}
486391 ,
487392 ".tmp_source.zig:4:6: error: no member named 'foo' in struct 'A'",
488393 ".tmp_source.zig:5:16: error: no member named 'bar' in struct 'A'");
......@@ -510,7 +415,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
510415 \\ y : i32,
511416 \\ z : i32,
512417 \\};
513 \\extern fn f() {
418 \\export fn f() {
514419 \\ const a = A {
515420 \\ .z = 1,
516421 \\ .y = 2,
......@@ -518,7 +423,6 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
518423 \\ .z = 4,
519424 \\ };
520425 \\}
521 \\comptime {@export("f", f);}
522426 , ".tmp_source.zig:11:9: error: duplicate field");
523427
524428 cases.add("missing field in struct value expression",
......@@ -527,7 +431,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
527431 \\ y : i32,
528432 \\ z : i32,
529433 \\};
530 \\extern fn f() {
434 \\export fn f() {
531435 \\ // we want the error on the '{' not the 'A' because
532436 \\ // the A could be a complicated expression
533437 \\ const a = A {
......@@ -535,7 +439,6 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
535439 \\ .y = 2,
536440 \\ };
537441 \\}
538 \\comptime {@export("f", f);}
539442 , ".tmp_source.zig:9:17: error: missing field: 'x'");
540443
541444 cases.add("invalid field in struct value expression",
......@@ -544,79 +447,69 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
544447 \\ y : i32,
545448 \\ z : i32,
546449 \\};
547 \\extern fn f() {
450 \\export fn f() {
548451 \\ const a = A {
549452 \\ .z = 4,
550453 \\ .y = 2,
551454 \\ .foo = 42,
552455 \\ };
553456 \\}
554 \\comptime {@export("f", f);}
555457 , ".tmp_source.zig:10:9: error: no member named 'foo' in struct 'A'");
556458
557459 cases.add("invalid break expression",
558 \\extern fn f() {
460 \\export fn f() {
559461 \\ break;
560462 \\}
561 \\comptime {@export("f", f);}
562463 , ".tmp_source.zig:2:5: error: break expression outside loop");
563464
564465 cases.add("invalid continue expression",
565 \\extern fn f() {
466 \\export fn f() {
566467 \\ continue;
567468 \\}
568 \\comptime {@export("f", f);}
569469 , ".tmp_source.zig:2:5: error: continue expression outside loop");
570470
571471 cases.add("invalid maybe type",
572 \\extern fn f() {
472 \\export fn f() {
573473 \\ if (true) |x| { }
574474 \\}
575 \\comptime {@export("f", f);}
576475 , ".tmp_source.zig:2:9: error: expected nullable type, found 'bool'");
577476
578477 cases.add("cast unreachable",
579478 \\fn f() -> i32 {
580479 \\ i32(return 1)
581480 \\}
582 \\extern fn entry() { _ = f(); }
583 \\comptime {@export("entry", entry);}
481 \\export fn entry() { _ = f(); }
584482 , ".tmp_source.zig:2:8: error: unreachable code");
585483
586484 cases.add("invalid builtin fn",
587485 \\fn f() -> @bogus(foo) {
588486 \\}
589 \\extern fn entry() { _ = f(); }
590 \\comptime {@export("entry", entry);}
487 \\export fn entry() { _ = f(); }
591488 , ".tmp_source.zig:1:11: error: invalid builtin function: 'bogus'");
592489
593490 cases.add("top level decl dependency loop",
594491 \\const a : @typeOf(b) = 0;
595492 \\const b : @typeOf(a) = 0;
596 \\extern fn entry() {
493 \\export fn entry() {
597494 \\ const c = a + b;
598495 \\}
599 \\comptime {@export("entry", entry);}
600496 , ".tmp_source.zig:1:1: error: 'a' depends on itself");
601497
602498 cases.add("noalias on non pointer param",
603499 \\fn f(noalias x: i32) {}
604 \\extern fn entry() { f(1234); }
605 \\comptime {@export("entry", entry);}
500 \\export fn entry() { f(1234); }
606501 , ".tmp_source.zig:1:6: error: noalias on non-pointer parameter");
607502
608503 cases.add("struct init syntax for array",
609504 \\const foo = []u16{.x = 1024,};
610 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
611 \\comptime {@export("entry", entry);}
505 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
612506 , ".tmp_source.zig:1:18: error: type '[]u16' does not support struct initialization syntax");
613507
614508 cases.add("type variables must be constant",
615509 \\var foo = u8;
616 \\extern fn entry() -> foo {
510 \\export fn entry() -> foo {
617511 \\ return 1;
618512 \\}
619 \\comptime {@export("entry", entry);}
620513 , ".tmp_source.zig:1:1: error: variable of type 'type' must be constant");
621514
622515
......@@ -628,10 +521,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
628521 \\ var Bar : i32 = undefined;
629522 \\}
630523 \\
631 \\extern fn entry() {
524 \\export fn entry() {
632525 \\ f(1234);
633526 \\}
634 \\comptime {@export("entry", entry);}
635527 ,
636528 ".tmp_source.zig:4:6: error: redefinition of 'Foo'",
637529 ".tmp_source.zig:1:1: note: previous definition is here",
......@@ -653,8 +545,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
653545 \\ }
654546 \\}
655547 \\
656 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
657 \\comptime {@export("entry", entry);}
548 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
658549 , ".tmp_source.zig:8:5: error: enumeration value 'Number.Four' not handled in switch");
659550
660551 cases.add("switch expression - duplicate enumeration prong",
......@@ -674,8 +565,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
674565 \\ }
675566 \\}
676567 \\
677 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
678 \\comptime {@export("entry", entry);}
568 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
679569 , ".tmp_source.zig:13:15: error: duplicate switch value",
680570 ".tmp_source.zig:10:15: note: other value is here");
681571
......@@ -697,8 +587,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
697587 \\ }
698588 \\}
699589 \\
700 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
701 \\comptime {@export("entry", entry);}
590 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
702591 , ".tmp_source.zig:13:15: error: duplicate switch value",
703592 ".tmp_source.zig:10:15: note: other value is here");
704593
......@@ -710,10 +599,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
710599 \\ else => true,
711600 \\ };
712601 \\}
713 \\extern fn entry() {
602 \\export fn entry() {
714603 \\ f(1234);
715604 \\}
716 \\comptime {@export("entry", entry);}
717605 , ".tmp_source.zig:5:9: error: multiple else prongs in switch expression");
718606
719607 cases.add("switch expression - non exhaustive integer prongs",
......@@ -722,8 +610,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
722610 \\ 0 => {},
723611 \\ }
724612 \\}
725 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
726 \\comptime {@export("entry", entry);}
613 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
727614 ,
728615 ".tmp_source.zig:2:5: error: switch must handle all possibilities");
729616
......@@ -736,8 +623,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
736623 \\ 206 ... 255 => 3,
737624 \\ }
738625 \\}
739 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
740 \\comptime {@export("entry", entry);}
626 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
741627 ,
742628 ".tmp_source.zig:6:9: error: duplicate switch value",
743629 ".tmp_source.zig:5:14: note: previous value is here");
......@@ -749,16 +635,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
749635 \\ }
750636 \\}
751637 \\const y: u8 = 100;
752 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
753 \\comptime {@export("entry", entry);}
638 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
754639 ,
755640 ".tmp_source.zig:2:5: error: else prong required when switching on type '&u8'");
756641
757642 cases.add("global variable initializer must be constant expression",
758643 \\extern fn foo() -> i32;
759644 \\const x = foo();
760 \\extern fn entry() -> i32 { x }
761 \\comptime {@export("entry", entry);}
645 \\export fn entry() -> i32 { x }
762646 , ".tmp_source.zig:2:11: error: unable to evaluate constant expression");
763647
764648 cases.add("array concatenation with wrong type",
......@@ -766,8 +650,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
766650 \\const derp = usize(1234);
767651 \\const a = derp ++ "foo";
768652 \\
769 \\extern fn entry() -> usize { @sizeOf(@typeOf(a)) }
770 \\comptime {@export("entry", entry);}
653 \\export fn entry() -> usize { @sizeOf(@typeOf(a)) }
771654 , ".tmp_source.zig:3:11: error: expected array or C string literal, found 'usize'");
772655
773656 cases.add("non compile time array concatenation",
......@@ -775,14 +658,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
775658 \\ s ++ "foo"
776659 \\}
777660 \\var s: [10]u8 = undefined;
778 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
779 \\comptime {@export("entry", entry);}
661 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
780662 , ".tmp_source.zig:2:5: error: unable to evaluate constant expression");
781663
782664 cases.add("@cImport with bogus include",
783665 \\const c = @cImport(@cInclude("bogus.h"));
784 \\extern fn entry() -> usize { @sizeOf(@typeOf(c.bogo)) }
785 \\comptime {@export("entry", entry);}
666 \\export fn entry() -> usize { @sizeOf(@typeOf(c.bogo)) }
786667 , ".tmp_source.zig:1:11: error: C import failed",
787668 ".h:1:10: note: 'bogus.h' file not found");
788669
......@@ -790,20 +671,17 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
790671 \\const x = 3;
791672 \\const y = &x;
792673 \\fn foo() -> &const i32 { y }
793 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
794 \\comptime {@export("entry", entry);}
674 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
795675 , ".tmp_source.zig:3:26: error: expected type '&const i32', found '&const (integer literal)'");
796676
797677 cases.add("integer overflow error",
798678 \\const x : u8 = 300;
799 \\extern fn entry() -> usize { @sizeOf(@typeOf(x)) }
800 \\comptime {@export("entry", entry);}
679 \\export fn entry() -> usize { @sizeOf(@typeOf(x)) }
801680 , ".tmp_source.zig:1:16: error: integer value 300 cannot be implicitly casted to type 'u8'");
802681
803682 cases.add("incompatible number literals",
804683 \\const x = 2 == 2.0;
805 \\extern fn entry() -> usize { @sizeOf(@typeOf(x)) }
806 \\comptime {@export("entry", entry);}
684 \\export fn entry() -> usize { @sizeOf(@typeOf(x)) }
807685 , ".tmp_source.zig:1:11: error: integer value 2 cannot be implicitly casted to type '(float literal)'");
808686
809687 cases.add("missing function call param",
......@@ -829,15 +707,13 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
829707 \\ const result = members[index]();
830708 \\}
831709 \\
832 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
833 \\comptime {@export("entry", entry);}
710 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
834711 , ".tmp_source.zig:20:34: error: expected 1 arguments, found 0");
835712
836713 cases.add("missing function name and param name",
837714 \\fn () {}
838715 \\fn f(i32) {}
839 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
840 \\comptime {@export("entry", entry);}
716 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
841717 ,
842718 ".tmp_source.zig:1:1: error: missing function name",
843719 ".tmp_source.zig:2:6: error: missing parameter name");
......@@ -847,20 +723,16 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
847723 \\fn a() -> i32 {0}
848724 \\fn b() -> i32 {1}
849725 \\fn c() -> i32 {2}
850 \\extern fn entry() -> usize { @sizeOf(@typeOf(fns)) }
851 \\comptime {@export("entry", entry);}
726 \\export fn entry() -> usize { @sizeOf(@typeOf(fns)) }
852727 , ".tmp_source.zig:1:21: error: expected type 'fn()', found 'fn() -> i32'");
853728
854729 cases.add("extern function pointer mismatch",
855730 \\const fns = [](fn(i32)->i32){ a, b, c };
856731 \\pub fn a(x: i32) -> i32 {x + 0}
857732 \\pub fn b(x: i32) -> i32 {x + 1}
858 \\extern fn c(x: i32) -> i32 {x + 2}
859 \\
860 \\extern fn entry() -> usize { @sizeOf(@typeOf(fns)) }
733 \\export fn c(x: i32) -> i32 {x + 2}
861734 \\
862 \\comptime {@export("entry", entry);}
863 \\comptime {@export("c", c);}
735 \\export fn entry() -> usize { @sizeOf(@typeOf(fns)) }
864736 , ".tmp_source.zig:1:37: error: expected type 'fn(i32) -> i32', found 'extern fn(i32) -> i32'");
865737
866738
......@@ -868,16 +740,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
868740 \\const x : f64 = 1.0;
869741 \\const y : f32 = x;
870742 \\
871 \\extern fn entry() -> usize { @sizeOf(@typeOf(y)) }
872 \\comptime {@export("entry", entry);}
743 \\export fn entry() -> usize { @sizeOf(@typeOf(y)) }
873744 , ".tmp_source.zig:2:17: error: expected type 'f32', found 'f64'");
874745
875746
876747 cases.add("colliding invalid top level functions",
877748 \\fn func() -> bogus {}
878749 \\fn func() -> bogus {}
879 \\extern fn entry() -> usize { @sizeOf(@typeOf(func)) }
880 \\comptime {@export("entry", entry);}
750 \\export fn entry() -> usize { @sizeOf(@typeOf(func)) }
881751 ,
882752 ".tmp_source.zig:2:1: error: redefinition of 'func'",
883753 ".tmp_source.zig:1:14: error: use of undeclared identifier 'bogus'");
......@@ -885,8 +755,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
885755
886756 cases.add("bogus compile var",
887757 \\const x = @import("builtin").bogus;
888 \\extern fn entry() -> usize { @sizeOf(@typeOf(x)) }
889 \\comptime {@export("entry", entry);}
758 \\export fn entry() -> usize { @sizeOf(@typeOf(x)) }
890759 , ".tmp_source.zig:1:29: error: no member named 'bogus' in '");
891760
892761
......@@ -897,8 +766,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
897766 \\var global_var: usize = 1;
898767 \\fn get() -> usize { global_var }
899768 \\
900 \\extern fn entry() -> usize { @sizeOf(@typeOf(Foo)) }
901 \\comptime {@export("entry", entry);}
769 \\export fn entry() -> usize { @sizeOf(@typeOf(Foo)) }
902770 ,
903771 ".tmp_source.zig:5:21: error: unable to evaluate constant expression",
904772 ".tmp_source.zig:2:12: note: called from here",
......@@ -911,8 +779,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
911779 \\};
912780 \\const x = Foo {.field = 1} + Foo {.field = 2};
913781 \\
914 \\extern fn entry() -> usize { @sizeOf(@typeOf(x)) }
915 \\comptime {@export("entry", entry);}
782 \\export fn entry() -> usize { @sizeOf(@typeOf(x)) }
916783 , ".tmp_source.zig:4:28: error: invalid operands to binary expression: 'Foo' and 'Foo'");
917784
918785
......@@ -922,14 +789,10 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
922789 \\const int_x = u32(1) / u32(0);
923790 \\const float_x = f32(1.0) / f32(0.0);
924791 \\
925 \\extern fn entry1() -> usize { @sizeOf(@typeOf(lit_int_x)) }
926 \\extern fn entry2() -> usize { @sizeOf(@typeOf(lit_float_x)) }
927 \\extern fn entry3() -> usize { @sizeOf(@typeOf(int_x)) }
928 \\extern fn entry4() -> usize { @sizeOf(@typeOf(float_x)) }
929 \\comptime {@export("entry1", entry1);}
930 \\comptime {@export("entry2", entry2);}
931 \\comptime {@export("entry3", entry3);}
932 \\comptime {@export("entry4", entry4);}
792 \\export fn entry1() -> usize { @sizeOf(@typeOf(lit_int_x)) }
793 \\export fn entry2() -> usize { @sizeOf(@typeOf(lit_float_x)) }
794 \\export fn entry3() -> usize { @sizeOf(@typeOf(int_x)) }
795 \\export fn entry4() -> usize { @sizeOf(@typeOf(float_x)) }
933796 ,
934797 ".tmp_source.zig:1:21: error: division by zero is undefined",
935798 ".tmp_source.zig:2:25: error: division by zero is undefined",
......@@ -941,16 +804,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
941804 \\const foo = "a
942805 \\b";
943806 \\
944 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
945 \\comptime {@export("entry", entry);}
807 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
946808 , ".tmp_source.zig:1:13: error: newline not allowed in string literal");
947809
948810 cases.add("invalid comparison for function pointers",
949811 \\fn foo() {}
950812 \\const invalid = foo > foo;
951813 \\
952 \\extern fn entry() -> usize { @sizeOf(@typeOf(invalid)) }
953 \\comptime {@export("entry", entry);}
814 \\export fn entry() -> usize { @sizeOf(@typeOf(invalid)) }
954815 , ".tmp_source.zig:2:21: error: operator not allowed for type 'fn()'");
955816
956817 cases.add("generic function instance with non-constant expression",
......@@ -959,18 +820,16 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
959820 \\ return foo(a, b);
960821 \\}
961822 \\
962 \\extern fn entry() -> usize { @sizeOf(@typeOf(test1)) }
963 \\comptime {@export("entry", entry);}
823 \\export fn entry() -> usize { @sizeOf(@typeOf(test1)) }
964824 , ".tmp_source.zig:3:16: error: unable to evaluate constant expression");
965825
966826 cases.add("goto jumping into block",
967 \\extern fn f() {
827 \\export fn f() {
968828 \\ {
969829 \\a_label:
970830 \\ }
971831 \\ goto a_label;
972832 \\}
973 \\comptime {@export("f", f);}
974833 , ".tmp_source.zig:5:5: error: no label in scope named 'a_label'");
975834
976835 cases.add("goto jumping past a defer",
......@@ -981,23 +840,20 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
981840 \\}
982841 \\fn derp(){}
983842 \\
984 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
985 \\comptime {@export("entry", entry);}
843 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
986844 , ".tmp_source.zig:2:12: error: no label in scope named 'label'");
987845
988846 cases.add("assign null to non-nullable pointer",
989847 \\const a: &u8 = null;
990848 \\
991 \\extern fn entry() -> usize { @sizeOf(@typeOf(a)) }
992 \\comptime {@export("entry", entry);}
849 \\export fn entry() -> usize { @sizeOf(@typeOf(a)) }
993850 , ".tmp_source.zig:1:16: error: expected type '&u8', found '(null)'");
994851
995852 cases.add("indexing an array of size zero",
996853 \\const array = []u8{};
997 \\extern fn foo() {
854 \\export fn foo() {
998855 \\ const pointer = &array[0];
999856 \\}
1000 \\comptime {@export("foo", foo);}
1001857 , ".tmp_source.zig:3:27: error: index 0 outside array of size 0");
1002858
1003859 cases.add("compile time division by zero",
......@@ -1006,8 +862,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1006862 \\ 1 / x
1007863 \\}
1008864 \\
1009 \\extern fn entry() -> usize { @sizeOf(@typeOf(y)) }
1010 \\comptime {@export("entry", entry);}
865 \\export fn entry() -> usize { @sizeOf(@typeOf(y)) }
1011866 ,
1012867 ".tmp_source.zig:3:7: error: division by zero is undefined",
1013868 ".tmp_source.zig:1:14: note: called from here");
......@@ -1015,8 +870,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1015870 cases.add("branch on undefined value",
1016871 \\const x = if (undefined) true else false;
1017872 \\
1018 \\extern fn entry() -> usize { @sizeOf(@typeOf(x)) }
1019 \\comptime {@export("entry", entry);}
873 \\export fn entry() -> usize { @sizeOf(@typeOf(x)) }
1020874 , ".tmp_source.zig:1:15: error: use of undefined value");
1021875
1022876
......@@ -1026,8 +880,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1026880 \\ return fibbonaci(x - 1) + fibbonaci(x - 2);
1027881 \\}
1028882 \\
1029 \\comptime {@export("entry", entry);}
1030 \\extern fn entry() -> usize { @sizeOf(@typeOf(seventh_fib_number)) }
883 \\export fn entry() -> usize { @sizeOf(@typeOf(seventh_fib_number)) }
1031884 ,
1032885 ".tmp_source.zig:3:21: error: evaluation exceeded 1000 backwards branches",
1033886 ".tmp_source.zig:3:21: note: called from here");
......@@ -1035,8 +888,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1035888 cases.add("@embedFile with bogus file",
1036889 \\const resource = @embedFile("bogus.txt");
1037890 \\
1038 \\comptime {@export("entry", entry);}
1039 \\extern fn entry() -> usize { @sizeOf(@typeOf(resource)) }
891 \\export fn entry() -> usize { @sizeOf(@typeOf(resource)) }
1040892 , ".tmp_source.zig:1:29: error: unable to find '", "bogus.txt'");
1041893
1042894 cases.add("non-const expression in struct literal outside function",
......@@ -1046,8 +898,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1046898 \\const a = Foo {.x = get_it()};
1047899 \\extern fn get_it() -> i32;
1048900 \\
1049 \\comptime {@export("entry", entry);}
1050 \\extern fn entry() -> usize { @sizeOf(@typeOf(a)) }
901 \\export fn entry() -> usize { @sizeOf(@typeOf(a)) }
1051902 , ".tmp_source.zig:4:21: error: unable to evaluate constant expression");
1052903
1053904 cases.add("non-const expression function call with struct return value outside function",
......@@ -1061,20 +912,18 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1061912 \\}
1062913 \\var global_side_effect = false;
1063914 \\
1064 \\comptime {@export("entry", entry);}
1065 \\extern fn entry() -> usize { @sizeOf(@typeOf(a)) }
915 \\export fn entry() -> usize { @sizeOf(@typeOf(a)) }
1066916 ,
1067917 ".tmp_source.zig:6:24: error: unable to evaluate constant expression",
1068918 ".tmp_source.zig:4:17: note: called from here");
1069919
1070920 cases.add("undeclared identifier error should mark fn as impure",
1071 \\extern fn foo() {
921 \\export fn foo() {
1072922 \\ test_a_thing();
1073923 \\}
1074924 \\fn test_a_thing() {
1075925 \\ bad_fn_call();
1076926 \\}
1077 \\comptime {@export("foo", foo);}
1078927 , ".tmp_source.zig:5:5: error: use of undeclared identifier 'bad_fn_call'");
1079928
1080929 cases.add("illegal comparison of types",
......@@ -1089,16 +938,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1089938 \\ *a == *b
1090939 \\}
1091940 \\
1092 \\extern fn entry1() -> usize { @sizeOf(@typeOf(bad_eql_1)) }
1093 \\extern fn entry2() -> usize { @sizeOf(@typeOf(bad_eql_2)) }
1094 \\comptime {@export("entry1", entry1);}
1095 \\comptime {@export("entry2", entry2);}
941 \\export fn entry1() -> usize { @sizeOf(@typeOf(bad_eql_1)) }
942 \\export fn entry2() -> usize { @sizeOf(@typeOf(bad_eql_2)) }
1096943 ,
1097944 ".tmp_source.zig:2:7: error: operator not allowed for type '[]u8'",
1098945 ".tmp_source.zig:9:8: error: operator not allowed for type 'EnumWithData'");
1099946
1100947 cases.add("non-const switch number literal",
1101 \\extern fn foo() {
948 \\export fn foo() {
1102949 \\ const x = switch (bar()) {
1103950 \\ 1, 2 => 1,
1104951 \\ 3, 4 => 2,
......@@ -1108,25 +955,22 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1108955 \\fn bar() -> i32 {
1109956 \\ 2
1110957 \\}
1111 \\comptime {@export("foo", foo);}
1112958 , ".tmp_source.zig:2:15: error: unable to infer expression type");
1113959
1114960 cases.add("atomic orderings of cmpxchg - failure stricter than success",
1115961 \\const AtomicOrder = @import("builtin").AtomicOrder;
1116 \\extern fn f() {
962 \\export fn f() {
1117963 \\ var x: i32 = 1234;
1118964 \\ while (!@cmpxchg(&x, 1234, 5678, AtomicOrder.Monotonic, AtomicOrder.SeqCst)) {}
1119965 \\}
1120 \\comptime {@export("f", f);}
1121966 , ".tmp_source.zig:4:72: error: failure atomic ordering must be no stricter than success");
1122967
1123968 cases.add("atomic orderings of cmpxchg - success Monotonic or stricter",
1124969 \\const AtomicOrder = @import("builtin").AtomicOrder;
1125 \\extern fn f() {
970 \\export fn f() {
1126971 \\ var x: i32 = 1234;
1127972 \\ while (!@cmpxchg(&x, 1234, 5678, AtomicOrder.Unordered, AtomicOrder.Unordered)) {}
1128973 \\}
1129 \\comptime {@export("f", f);}
1130974 , ".tmp_source.zig:4:49: error: success atomic ordering must be Monotonic or stricter");
1131975
1132976 cases.add("negation overflow in function evaluation",
......@@ -1135,8 +979,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1135979 \\ -x
1136980 \\}
1137981 \\
1138 \\extern fn entry() -> usize { @sizeOf(@typeOf(y)) }
1139 \\comptime {@export("entry", entry);}
982 \\export fn entry() -> usize { @sizeOf(@typeOf(y)) }
1140983 ,
1141984 ".tmp_source.zig:3:5: error: negation caused overflow",
1142985 ".tmp_source.zig:1:14: note: called from here");
......@@ -1147,8 +990,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
1147990 \\ a + b
1148991 \\}
1149992 \\
1150 \\extern fn entry() -> usize { @sizeOf(@typeOf(y)) }
1151 \\comptime {@export("entry", entry);}
993 \\export fn entry() -> usize { @sizeOf(@typeOf(y)) }
1152994 ,
1153995 ".tmp_source.zig:3:7: error: operation caused overflow",
1154996 ".tmp_source.zig:1:14: note: called from here");
......@@ -1160,8 +1002,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
11601002 \\ a - b
11611003 \\}
11621004 \\
1163 \\extern fn entry() -> usize { @sizeOf(@typeOf(y)) }
1164 \\comptime {@export("entry", entry);}
1005 \\export fn entry() -> usize { @sizeOf(@typeOf(y)) }
11651006 ,
11661007 ".tmp_source.zig:3:7: error: operation caused overflow",
11671008 ".tmp_source.zig:1:14: note: called from here");
......@@ -1172,8 +1013,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
11721013 \\ a * b
11731014 \\}
11741015 \\
1175 \\extern fn entry() -> usize { @sizeOf(@typeOf(y)) }
1176 \\comptime {@export("entry", entry);}
1016 \\export fn entry() -> usize { @sizeOf(@typeOf(y)) }
11771017 ,
11781018 ".tmp_source.zig:3:7: error: operation caused overflow",
11791019 ".tmp_source.zig:1:14: note: called from here");
......@@ -1184,35 +1024,40 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
11841024 \\ @truncate(i8, x)
11851025 \\}
11861026 \\
1187 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
1188 \\comptime {@export("entry", entry);}
1027 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
11891028 , ".tmp_source.zig:3:19: error: expected signed integer type, found 'u32'");
11901029
11911030 cases.add("%return in function with non error return type",
1192 \\extern fn f() {
1031 \\export fn f() {
11931032 \\ %return something();
11941033 \\}
11951034 \\fn something() -> %void { }
1196 \\comptime {@export("f", f);}
11971035 ,
11981036 ".tmp_source.zig:2:5: error: expected type 'void', found 'error'");
11991037
1038 cases.add("wrong return type for main",
1039 \\pub fn main() { }
1040 , ".tmp_source.zig:1:15: error: expected return type of main to be '%void', instead is 'void'");
1041
1042 cases.add("double ?? on main return value",
1043 \\pub fn main() -> ??void {
1044 \\}
1045 , ".tmp_source.zig:1:18: error: expected return type of main to be '%void', instead is '??void'");
1046
12001047 cases.add("invalid pointer for var type",
12011048 \\extern fn ext() -> usize;
12021049 \\var bytes: [ext()]u8 = undefined;
1203 \\extern fn f() {
1050 \\export fn f() {
12041051 \\ for (bytes) |*b, i| {
12051052 \\ *b = u8(i);
12061053 \\ }
12071054 \\}
1208 \\comptime {@export("f", f);}
12091055 , ".tmp_source.zig:2:13: error: unable to evaluate constant expression");
12101056
12111057 cases.add("export function with comptime parameter",
1212 \\extern fn foo(comptime x: i32, y: i32) -> i32{
1058 \\export fn foo(comptime x: i32, y: i32) -> i32{
12131059 \\ x + y
12141060 \\}
1215 \\comptime {@export("foo", foo);}
12161061 , ".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'");
12171062
12181063 cases.add("extern function with comptime parameter",
......@@ -1220,16 +1065,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
12201065 \\fn f() -> i32 {
12211066 \\ foo(1, 2)
12221067 \\}
1223 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
1224 \\comptime {@export("entry", entry);}
1068 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
12251069 , ".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'");
12261070
12271071 cases.add("convert fixed size array to slice with invalid size",
1228 \\extern fn f() {
1072 \\export fn f() {
12291073 \\ var array: [5]u8 = undefined;
12301074 \\ var foo = ([]const u32)(array)[0];
12311075 \\}
1232 \\comptime {@export("f", f);}
12331076 , ".tmp_source.zig:3:28: error: unable to convert [5]u8 to []const u32: size mismatch");
12341077
12351078 cases.add("non-pure function returns type",
......@@ -1247,11 +1090,10 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
12471090 \\ }
12481091 \\}
12491092 \\
1250 \\extern fn function_with_return_type_type() {
1093 \\export fn function_with_return_type_type() {
12511094 \\ var list: List(i32) = undefined;
12521095 \\ list.length = 10;
12531096 \\}
1254 \\comptime {@export("function_with_return_type_type", function_with_return_type_type);}
12551097 , ".tmp_source.zig:3:7: error: unable to evaluate constant expression",
12561098 ".tmp_source.zig:16:19: note: called from here");
12571099
......@@ -1260,8 +1102,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
12601102 \\fn f(m: []const u8) {
12611103 \\ m.copy(u8, self[0..], m);
12621104 \\}
1263 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
1264 \\comptime {@export("entry", entry);}
1105 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
12651106 , ".tmp_source.zig:3:6: error: no member named 'copy' in '[]const u8'");
12661107
12671108 cases.add("wrong number of arguments for method fn call",
......@@ -1272,24 +1113,21 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
12721113 \\
12731114 \\ foo.method(1, 2);
12741115 \\}
1275 \\extern fn entry() -> usize { @sizeOf(@typeOf(f)) }
1276 \\comptime {@export("entry", entry);}
1116 \\export fn entry() -> usize { @sizeOf(@typeOf(f)) }
12771117 , ".tmp_source.zig:6:15: error: expected 2 arguments, found 3");
12781118
12791119 cases.add("assign through constant pointer",
1280 \\extern fn f() {
1120 \\export fn f() {
12811121 \\ var cstr = c"Hat";
12821122 \\ cstr[0] = 'W';
12831123 \\}
1284 \\comptime {@export("f", f);}
12851124 , ".tmp_source.zig:3:11: error: cannot assign to constant");
12861125
12871126 cases.add("assign through constant slice",
1288 \\extern fn f() {
1127 \\export fn f() {
12891128 \\ var cstr: []const u8 = "Hat";
12901129 \\ cstr[0] = 'W';
12911130 \\}
1292 \\comptime {@export("f", f);}
12931131 , ".tmp_source.zig:3:11: error: cannot assign to constant");
12941132
12951133 cases.add("main function with bogus args type",
......@@ -1300,8 +1138,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
13001138 \\fn foo(blah: []u8) {
13011139 \\ for (blah) { }
13021140 \\}
1303 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
1304 \\comptime {@export("entry", entry);}
1141 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
13051142 , ".tmp_source.zig:2:5: error: for loop expression missing element parameter");
13061143
13071144 cases.add("misspelled type with pointer only reference",
......@@ -1334,8 +1171,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
13341171 \\ var jd = JsonNode {.kind = JsonType.JSONArray , .jobject = JsonOA.JSONArray {jll} };
13351172 \\}
13361173 \\
1337 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
1338 \\comptime {@export("entry", entry);}
1174 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
13391175 , ".tmp_source.zig:5:16: error: use of undeclared identifier 'JsonList'");
13401176
13411177 cases.add("method call with first arg type primitive",
......@@ -1349,12 +1185,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
13491185 \\ }
13501186 \\};
13511187 \\
1352 \\extern fn f() {
1188 \\export fn f() {
13531189 \\ const derp = Foo.init(3);
13541190 \\
13551191 \\ derp.init();
13561192 \\}
1357 \\comptime {@export("f", f);}
13581193 , ".tmp_source.zig:14:5: error: expected type 'i32', found '&const Foo'");
13591194
13601195 cases.add("method call with first arg type wrong container",
......@@ -1378,11 +1213,10 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
13781213 \\ field: i32,
13791214 \\};
13801215 \\
1381 \\extern fn foo() {
1216 \\export fn foo() {
13821217 \\ var x = List.init(&global_allocator);
13831218 \\ x.init();
13841219 \\}
1385 \\comptime {@export("foo", foo);}
13861220 , ".tmp_source.zig:23:5: error: expected type '&Allocator', found '&List'");
13871221
13881222 cases.add("binary not on number literal",
......@@ -1390,18 +1224,16 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
13901224 \\const TINY_QUANTUM_SIZE = 1 << TINY_QUANTUM_SHIFT;
13911225 \\var block_aligned_stuff: usize = (4 + TINY_QUANTUM_SIZE) & ~(TINY_QUANTUM_SIZE - 1);
13921226 \\
1393 \\extern fn entry() -> usize { @sizeOf(@typeOf(block_aligned_stuff)) }
1394 \\comptime {@export("entry", entry);}
1227 \\export fn entry() -> usize { @sizeOf(@typeOf(block_aligned_stuff)) }
13951228 , ".tmp_source.zig:3:60: error: unable to perform binary not operation on type '(integer literal)'");
13961229
13971230 cases.addCase({
13981231 const tc = cases.create("multiple files with private function error",
13991232 \\const foo = @import("foo.zig");
14001233 \\
1401 \\extern fn callPrivFunction() {
1234 \\export fn callPrivFunction() {
14021235 \\ foo.privateFunction();
14031236 \\}
1404 \\comptime {@export("callPrivFunction", callPrivFunction);}
14051237 ,
14061238 ".tmp_source.zig:4:8: error: 'privateFunction' is private",
14071239 "foo.zig:1:1: note: declared here");
......@@ -1417,19 +1249,17 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
14171249 \\const zero: i32 = 0;
14181250 \\const a = zero{1};
14191251 \\
1420 \\extern fn entry() -> usize { @sizeOf(@typeOf(a)) }
1421 \\comptime {@export("entry", entry);}
1252 \\export fn entry() -> usize { @sizeOf(@typeOf(a)) }
14221253 , ".tmp_source.zig:2:11: error: expected type, found 'i32'");
14231254
14241255 cases.add("assign to constant field",
14251256 \\const Foo = struct {
14261257 \\ field: i32,
14271258 \\};
1428 \\extern fn derp() {
1259 \\export fn derp() {
14291260 \\ const f = Foo {.field = 1234,};
14301261 \\ f.field = 0;
14311262 \\}
1432 \\comptime {@export("derp", derp);}
14331263 , ".tmp_source.zig:6:13: error: cannot assign to constant");
14341264
14351265 cases.add("return from defer expression",
......@@ -1447,8 +1277,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
14471277 \\ return 0;
14481278 \\}
14491279 \\
1450 \\extern fn entry() -> usize { @sizeOf(@typeOf(testTrickyDefer)) }
1451 \\comptime {@export("entry", entry);}
1280 \\export fn entry() -> usize { @sizeOf(@typeOf(testTrickyDefer)) }
14521281 , ".tmp_source.zig:4:11: error: cannot return from defer expression");
14531282
14541283 cases.add("attempt to access var args out of bounds",
......@@ -1460,8 +1289,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
14601289 \\ add(i32(1234))
14611290 \\}
14621291 \\
1463 \\comptime {@export("entry", entry);}
1464 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
1292 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
14651293 ,
14661294 ".tmp_source.zig:2:19: error: index 1 outside argument list of size 1",
14671295 ".tmp_source.zig:6:8: note: called from here");
......@@ -1479,31 +1307,27 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
14791307 \\ add(1, 2, 3, 4)
14801308 \\}
14811309 \\
1482 \\comptime {@export("entry", entry);}
1483 \\extern fn entry() -> usize { @sizeOf(@typeOf(bar)) }
1310 \\export fn entry() -> usize { @sizeOf(@typeOf(bar)) }
14841311 , ".tmp_source.zig:10:9: error: parameter of type '(integer literal)' requires comptime");
14851312
14861313 cases.add("assign too big number to u16",
1487 \\extern fn foo() {
1314 \\export fn foo() {
14881315 \\ var vga_mem: u16 = 0xB8000;
14891316 \\}
1490 \\comptime {@export("foo", foo);}
14911317 , ".tmp_source.zig:2:24: error: integer value 753664 cannot be implicitly casted to type 'u16'");
14921318
14931319 cases.add("global variable alignment non power of 2",
14941320 \\const some_data: [100]u8 align(3) = undefined;
1495 \\extern fn entry() -> usize { @sizeOf(@typeOf(some_data)) }
1496 \\comptime {@export("entry", entry);}
1321 \\export fn entry() -> usize { @sizeOf(@typeOf(some_data)) }
14971322 , ".tmp_source.zig:1:32: error: alignment value 3 is not a power of 2");
14981323
14991324 cases.add("function alignment non power of 2",
15001325 \\extern fn foo() align(3);
1501 \\extern fn entry() { foo() }
1502 \\comptime {@export("entry", entry);}
1326 \\export fn entry() { foo() }
15031327 , ".tmp_source.zig:1:23: error: alignment value 3 is not a power of 2");
15041328
15051329 cases.add("compile log",
1506 \\extern fn foo() {
1330 \\export fn foo() {
15071331 \\ comptime bar(12, "hi");
15081332 \\}
15091333 \\fn bar(a: i32, b: []const u8) {
......@@ -1511,7 +1335,6 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
15111335 \\ @compileLog("a", a, "b", b);
15121336 \\ @compileLog("end");
15131337 \\}
1514 \\comptime {@export("foo", foo);}
15151338 ,
15161339 ".tmp_source.zig:5:5: error: found compile log statement",
15171340 ".tmp_source.zig:2:17: note: called from here",
......@@ -1535,8 +1358,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
15351358 \\ return *x;
15361359 \\}
15371360 \\
1538 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
1539 \\comptime {@export("entry", entry);}
1361 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
15401362 , ".tmp_source.zig:8:26: error: expected type '&const u3', found '&align(1:3:6) const u3'");
15411363
15421364 cases.add("referring to a struct that is invalid",
......@@ -1544,20 +1366,19 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
15441366 \\ Type: u8,
15451367 \\};
15461368 \\
1547 \\extern fn foo() {
1369 \\export fn foo() {
15481370 \\ comptime assert(@sizeOf(UsbDeviceRequest) == 0x8);
15491371 \\}
15501372 \\
15511373 \\fn assert(ok: bool) {
15521374 \\ if (!ok) unreachable;
15531375 \\}
1554 \\comptime {@export("foo", foo);}
15551376 ,
15561377 ".tmp_source.zig:10:14: error: unable to evaluate constant expression",
15571378 ".tmp_source.zig:6:20: note: called from here");
15581379
15591380 cases.add("control flow uses comptime var at runtime",
1560 \\extern fn foo() {
1381 \\export fn foo() {
15611382 \\ comptime var i = 0;
15621383 \\ while (i < 5) : (i += 1) {
15631384 \\ bar();
......@@ -1565,61 +1386,53 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
15651386 \\}
15661387 \\
15671388 \\fn bar() { }
1568 \\comptime {@export("foo", foo);}
15691389 ,
15701390 ".tmp_source.zig:3:5: error: control flow attempts to use compile-time variable at runtime",
15711391 ".tmp_source.zig:3:24: note: compile-time variable assigned here");
15721392
15731393 cases.add("ignored return value",
1574 \\extern fn foo() {
1394 \\export fn foo() {
15751395 \\ bar();
15761396 \\}
15771397 \\fn bar() -> i32 { 0 }
1578 \\comptime {@export("foo", foo);}
15791398 , ".tmp_source.zig:2:8: error: expression value is ignored");
15801399
15811400 cases.add("ignored assert-err-ok return value",
1582 \\extern fn foo() {
1401 \\export fn foo() {
15831402 \\ %%bar();
15841403 \\}
15851404 \\fn bar() -> %i32 { 0 }
1586 \\comptime {@export("foo", foo);}
15871405 , ".tmp_source.zig:2:5: error: expression value is ignored");
15881406
15891407 cases.add("ignored statement value",
1590 \\extern fn foo() {
1408 \\export fn foo() {
15911409 \\ 1;
15921410 \\}
1593 \\comptime {@export("foo", foo);}
15941411 , ".tmp_source.zig:2:5: error: expression value is ignored");
15951412
15961413 cases.add("ignored comptime statement value",
1597 \\extern fn foo() {
1414 \\export fn foo() {
15981415 \\ comptime {1;}
15991416 \\}
1600 \\comptime {@export("foo", foo);}
16011417 , ".tmp_source.zig:2:15: error: expression value is ignored");
16021418
16031419 cases.add("ignored comptime value",
1604 \\extern fn foo() {
1420 \\export fn foo() {
16051421 \\ comptime 1;
16061422 \\}
1607 \\comptime {@export("foo", foo);}
16081423 , ".tmp_source.zig:2:5: error: expression value is ignored");
16091424
16101425 cases.add("ignored defered statement value",
1611 \\extern fn foo() {
1426 \\export fn foo() {
16121427 \\ defer {1;}
16131428 \\}
1614 \\comptime {@export("foo", foo);}
16151429 , ".tmp_source.zig:2:12: error: expression value is ignored");
16161430
16171431 cases.add("ignored defered statement value",
1618 \\extern fn foo() {
1432 \\export fn foo() {
16191433 \\ defer bar();
16201434 \\}
16211435 \\fn bar() -> %i32 { 0 }
1622 \\comptime {@export("foo", foo);}
16231436 , ".tmp_source.zig:2:14: error: expression value is ignored");
16241437
16251438 cases.add("dereference an array",
......@@ -1630,8 +1443,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
16301443 \\ return (*out)[0..1];
16311444 \\}
16321445 \\
1633 \\extern fn entry() -> usize { @sizeOf(@typeOf(pass)) }
1634 \\comptime {@export("entry", entry);}
1446 \\export fn entry() -> usize { @sizeOf(@typeOf(pass)) }
16351447 , ".tmp_source.zig:4:5: error: attempt to dereference non pointer type '[10]u8'");
16361448
16371449 cases.add("pass const ptr to mutable ptr fn",
......@@ -1644,31 +1456,46 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
16441456 \\ return true;
16451457 \\}
16461458 \\
1647 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
1648 \\comptime {@export("entry", entry);}
1459 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
16491460 , ".tmp_source.zig:4:19: error: expected type '&[]const u8', found '&const []const u8'");
16501461
1462 cases.addCase({
1463 const tc = cases.create("export collision",
1464 \\const foo = @import("foo.zig");
1465 \\
1466 \\export fn bar() -> usize {
1467 \\ return foo.baz;
1468 \\}
1469 ,
1470 "foo.zig:1:8: error: exported symbol collision: 'bar'",
1471 ".tmp_source.zig:3:8: note: other symbol here");
1472
1473 tc.addSourceFile("foo.zig",
1474 \\export fn bar() {}
1475 \\pub const baz = 1234;
1476 );
1477
1478 tc
1479 });
1480
16511481 cases.add("pass non-copyable type by value to function",
16521482 \\const Point = struct { x: i32, y: i32, };
16531483 \\fn foo(p: Point) { }
1654 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
1655 \\comptime {@export("entry", entry);}
1484 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
16561485 , ".tmp_source.zig:2:11: error: type 'Point' is not copyable; cannot pass by value");
16571486
16581487 cases.add("implicit cast from array to mutable slice",
16591488 \\var global_array: [10]i32 = undefined;
16601489 \\fn foo(param: []i32) {}
1661 \\extern fn entry() {
1490 \\export fn entry() {
16621491 \\ foo(global_array);
16631492 \\}
1664 \\comptime {@export("entry", entry);}
16651493 , ".tmp_source.zig:4:9: error: expected type '[]i32', found '[10]i32'");
16661494
16671495 cases.add("ptrcast to non-pointer",
1668 \\extern fn entry(a: &i32) -> usize {
1496 \\export fn entry(a: &i32) -> usize {
16691497 \\ return @ptrCast(usize, a);
16701498 \\}
1671 \\comptime {@export("entry", entry);}
16721499 , ".tmp_source.zig:2:21: error: expected pointer, found 'usize'");
16731500
16741501 cases.add("too many error values to cast to small integer",
......@@ -1677,8 +1504,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
16771504 \\fn foo(e: error) -> u2 {
16781505 \\ return u2(e);
16791506 \\}
1680 \\extern fn entry() -> usize { @sizeOf(@typeOf(foo)) }
1681 \\comptime {@export("entry", entry);}
1507 \\export fn entry() -> usize { @sizeOf(@typeOf(foo)) }
16821508 , ".tmp_source.zig:4:14: error: too many error values to fit in 'u2'");
16831509
16841510 cases.add("asm at compile time",
......@@ -1697,46 +1523,41 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
16971523
16981524 cases.add("invalid member of builtin enum",
16991525 \\const builtin = @import("builtin");
1700 \\extern fn entry() {
1526 \\export fn entry() {
17011527 \\ const foo = builtin.Arch.x86;
17021528 \\}
1703 \\comptime {@export("entry", entry);}
17041529 , ".tmp_source.zig:3:29: error: container 'Arch' has no member called 'x86'");
17051530
17061531 cases.add("int to ptr of 0 bits",
1707 \\extern fn foo() {
1532 \\export fn foo() {
17081533 \\ var x: usize = 0x1000;
17091534 \\ var y: &void = @intToPtr(&void, x);
17101535 \\}
1711 \\comptime {@export("foo", foo);}
17121536 , ".tmp_source.zig:3:31: error: type '&void' has 0 bits and cannot store information");
17131537
17141538 cases.add("@fieldParentPtr - non struct",
17151539 \\const Foo = i32;
1716 \\extern fn foo(a: &i32) -> &Foo {
1540 \\export fn foo(a: &i32) -> &Foo {
17171541 \\ return @fieldParentPtr(Foo, "a", a);
17181542 \\}
1719 \\comptime {@export("foo", foo);}
17201543 , ".tmp_source.zig:3:28: error: expected struct type, found 'i32'");
17211544
17221545 cases.add("@fieldParentPtr - bad field name",
17231546 \\const Foo = struct {
17241547 \\ derp: i32,
17251548 \\};
1726 \\extern fn foo(a: &i32) -> &Foo {
1549 \\export fn foo(a: &i32) -> &Foo {
17271550 \\ return @fieldParentPtr(Foo, "a", a);
17281551 \\}
1729 \\comptime {@export("foo", foo);}
17301552 , ".tmp_source.zig:5:33: error: struct 'Foo' has no field 'a'");
17311553
17321554 cases.add("@fieldParentPtr - field pointer is not pointer",
17331555 \\const Foo = struct {
17341556 \\ a: i32,
17351557 \\};
1736 \\extern fn foo(a: i32) -> &Foo {
1558 \\export fn foo(a: i32) -> &Foo {
17371559 \\ return @fieldParentPtr(Foo, "a", a);
17381560 \\}
1739 \\comptime {@export("foo", foo);}
17401561 , ".tmp_source.zig:5:38: error: expected pointer, found 'i32'");
17411562
17421563 cases.add("@fieldParentPtr - comptime field ptr not based on struct",
......@@ -1766,20 +1587,18 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
17661587
17671588 cases.add("@offsetOf - non struct",
17681589 \\const Foo = i32;
1769 \\extern fn foo() -> usize {
1590 \\export fn foo() -> usize {
17701591 \\ return @offsetOf(Foo, "a");
17711592 \\}
1772 \\comptime {@export("foo", foo);}
17731593 , ".tmp_source.zig:3:22: error: expected struct type, found 'i32'");
17741594
17751595 cases.add("@offsetOf - bad field name",
17761596 \\const Foo = struct {
17771597 \\ derp: i32,
17781598 \\};
1779 \\extern fn foo() -> usize {
1599 \\export fn foo() -> usize {
17801600 \\ return @offsetOf(Foo, "a");
17811601 \\}
1782 \\comptime {@export("foo", foo);}
17831602 , ".tmp_source.zig:5:27: error: struct 'Foo' has no field 'a'");
17841603
17851604 cases.addExe("missing main fn in executable",
......@@ -1792,22 +1611,44 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
17921611 "error: 'main' is private",
17931612 ".tmp_source.zig:1:1: note: declared here");
17941613
1614 cases.add("setting a section on an extern variable",
1615 \\extern var foo: i32 section(".text2");
1616 \\export fn entry() -> i32 {
1617 \\ return foo;
1618 \\}
1619 ,
1620 ".tmp_source.zig:1:29: error: cannot set section of external variable 'foo'");
1621
1622 cases.add("setting a section on a local variable",
1623 \\export fn entry() -> i32 {
1624 \\ var foo: i32 section(".text2") = 1234;
1625 \\ return foo;
1626 \\}
1627 ,
1628 ".tmp_source.zig:2:26: error: cannot set section of local variable 'foo'");
1629
1630 cases.add("setting a section on an extern fn",
1631 \\extern fn foo() section(".text2");
1632 \\export fn entry() {
1633 \\ foo();
1634 \\}
1635 ,
1636 ".tmp_source.zig:1:25: error: cannot set section of external function 'foo'");
1637
17951638 cases.add("returning address of local variable - simple",
1796 \\extern fn foo() -> &i32 {
1639 \\export fn foo() -> &i32 {
17971640 \\ var a: i32 = undefined;
17981641 \\ return &a;
17991642 \\}
1800 \\comptime {@export("foo", foo);}
18011643 ,
18021644 ".tmp_source.zig:3:13: error: function returns address of local variable");
18031645
18041646 cases.add("returning address of local variable - phi",
1805 \\extern fn foo(c: bool) -> &i32 {
1647 \\export fn foo(c: bool) -> &i32 {
18061648 \\ var a: i32 = undefined;
18071649 \\ var b: i32 = undefined;
18081650 \\ return if (c) &a else &b;
18091651 \\}
1810 \\comptime {@export("foo", foo);}
18111652 ,
18121653 ".tmp_source.zig:4:12: error: function returns address of local variable");
18131654
......@@ -1836,61 +1677,55 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
18361677 ".tmp_source.zig:5:9: note: previous definition is here");
18371678
18381679 cases.add("while expected bool, got nullable",
1839 \\extern fn foo() {
1680 \\export fn foo() {
18401681 \\ while (bar()) {}
18411682 \\}
18421683 \\fn bar() -> ?i32 { 1 }
1843 \\comptime {@export("foo", foo);}
18441684 ,
18451685 ".tmp_source.zig:2:15: error: expected type 'bool', found '?i32'");
18461686
18471687 cases.add("while expected bool, got error union",
1848 \\extern fn foo() {
1688 \\export fn foo() {
18491689 \\ while (bar()) {}
18501690 \\}
18511691 \\fn bar() -> %i32 { 1 }
1852 \\comptime {@export("foo", foo);}
18531692 ,
18541693 ".tmp_source.zig:2:15: error: expected type 'bool', found '%i32'");
18551694
18561695 cases.add("while expected nullable, got bool",
1857 \\extern fn foo() {
1696 \\export fn foo() {
18581697 \\ while (bar()) |x| {}
18591698 \\}
18601699 \\fn bar() -> bool { true }
1861 \\comptime {@export("foo", foo);}
18621700 ,
18631701 ".tmp_source.zig:2:15: error: expected nullable type, found 'bool'");
18641702
18651703 cases.add("while expected nullable, got error union",
1866 \\extern fn foo() {
1704 \\export fn foo() {
18671705 \\ while (bar()) |x| {}
18681706 \\}
18691707 \\fn bar() -> %i32 { 1 }
1870 \\comptime {@export("foo", foo);}
18711708 ,
18721709 ".tmp_source.zig:2:15: error: expected nullable type, found '%i32'");
18731710
18741711 cases.add("while expected error union, got bool",
1875 \\extern fn foo() {
1712 \\export fn foo() {
18761713 \\ while (bar()) |x| {} else |err| {}
18771714 \\}
18781715 \\fn bar() -> bool { true }
1879 \\comptime {@export("foo", foo);}
18801716 ,
18811717 ".tmp_source.zig:2:15: error: expected error union type, found 'bool'");
18821718
18831719 cases.add("while expected error union, got nullable",
1884 \\extern fn foo() {
1720 \\export fn foo() {
18851721 \\ while (bar()) |x| {} else |err| {}
18861722 \\}
18871723 \\fn bar() -> ?i32 { 1 }
1888 \\comptime {@export("foo", foo);}
18891724 ,
18901725 ".tmp_source.zig:2:15: error: expected error union type, found '?i32'");
18911726
18921727 cases.add("inline fn calls itself indirectly",
1893 \\extern fn foo() {
1728 \\export fn foo() {
18941729 \\ bar();
18951730 \\}
18961731 \\inline fn bar() {
......@@ -1902,33 +1737,29 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
19021737 \\ quux();
19031738 \\}
19041739 \\extern fn quux();
1905 \\comptime {@export("foo", foo);}
19061740 ,
19071741 ".tmp_source.zig:4:8: error: unable to inline function");
19081742
19091743 cases.add("save reference to inline function",
1910 \\extern fn foo() {
1744 \\export fn foo() {
19111745 \\ quux(@ptrToInt(bar));
19121746 \\}
19131747 \\inline fn bar() { }
19141748 \\extern fn quux(usize);
1915 \\comptime {@export("foo", foo);}
19161749 ,
19171750 ".tmp_source.zig:4:8: error: unable to inline function");
19181751
19191752 cases.add("signed integer division",
1920 \\extern fn foo(a: i32, b: i32) -> i32 {
1753 \\export fn foo(a: i32, b: i32) -> i32 {
19211754 \\ a / b
19221755 \\}
1923 \\comptime {@export("foo", foo);}
19241756 ,
19251757 ".tmp_source.zig:2:7: error: division with 'i32' and 'i32': signed integers must use @divTrunc, @divFloor, or @divExact");
19261758
19271759 cases.add("signed integer remainder division",
1928 \\extern fn foo(a: i32, b: i32) -> i32 {
1760 \\export fn foo(a: i32, b: i32) -> i32 {
19291761 \\ a % b
19301762 \\}
1931 \\comptime {@export("foo", foo);}
19321763 ,
19331764 ".tmp_source.zig:2:7: error: remainder division with 'i32' and 'i32': signed integers and floats must use @rem or @mod");
19341765
......@@ -1967,65 +1798,59 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
19671798 ".tmp_source.zig:3:20: error: cast from 'u16' to 'u8' truncates bits");
19681799
19691800 cases.add("@setDebugSafety twice for same scope",
1970 \\extern fn foo() {
1801 \\export fn foo() {
19711802 \\ @setDebugSafety(this, false);
19721803 \\ @setDebugSafety(this, false);
19731804 \\}
1974 \\comptime {@export("foo", foo);}
19751805 ,
19761806 ".tmp_source.zig:3:5: error: debug safety set twice for same scope",
19771807 ".tmp_source.zig:2:5: note: first set here");
19781808
19791809 cases.add("@setFloatMode twice for same scope",
1980 \\extern fn foo() {
1810 \\export fn foo() {
19811811 \\ @setFloatMode(this, @import("builtin").FloatMode.Optimized);
19821812 \\ @setFloatMode(this, @import("builtin").FloatMode.Optimized);
19831813 \\}
1984 \\comptime {@export("foo", foo);}
19851814 ,
19861815 ".tmp_source.zig:3:5: error: float mode set twice for same scope",
19871816 ".tmp_source.zig:2:5: note: first set here");
19881817
19891818 cases.add("array access of type",
1990 \\extern fn foo() {
1819 \\export fn foo() {
19911820 \\ var b: u8[40] = undefined;
19921821 \\}
1993 \\comptime {@export("foo", foo);}
19941822 ,
19951823 ".tmp_source.zig:2:14: error: array access of non-array type 'type'");
19961824
19971825 cases.add("cannot break out of defer expression",
1998 \\extern fn foo() {
1826 \\export fn foo() {
19991827 \\ while (true) {
20001828 \\ defer {
20011829 \\ break;
20021830 \\ }
20031831 \\ }
20041832 \\}
2005 \\comptime {@export("foo", foo);}
20061833 ,
20071834 ".tmp_source.zig:4:13: error: cannot break out of defer expression");
20081835
20091836 cases.add("cannot continue out of defer expression",
2010 \\extern fn foo() {
1837 \\export fn foo() {
20111838 \\ while (true) {
20121839 \\ defer {
20131840 \\ continue;
20141841 \\ }
20151842 \\ }
20161843 \\}
2017 \\comptime {@export("foo", foo);}
20181844 ,
20191845 ".tmp_source.zig:4:13: error: cannot continue out of defer expression");
20201846
20211847 cases.add("cannot goto out of defer expression",
2022 \\extern fn foo() {
1848 \\export fn foo() {
20231849 \\ defer {
20241850 \\ goto label;
20251851 \\ };
20261852 \\label:
20271853 \\}
2028 \\comptime {@export("foo", foo);}
20291854 ,
20301855 ".tmp_source.zig:3:9: error: cannot goto out of defer expression");
20311856
......@@ -2059,10 +1884,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
20591884 \\const bar = baz + foo;
20601885 \\const baz = 1;
20611886 \\
2062 \\extern fn entry() -> i32 {
1887 \\export fn entry() -> i32 {
20631888 \\ return bar;
20641889 \\}
2065 \\comptime {@export("entry", entry);}
20661890 ,
20671891 ".tmp_source.zig:1:13: error: aoeu",
20681892 ".tmp_source.zig:3:19: note: referenced here",
......@@ -2075,10 +1899,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
20751899 \\
20761900 \\var foo: Foo = undefined;
20771901 \\
2078 \\extern fn entry() -> usize {
1902 \\export fn entry() -> usize {
20791903 \\ return @sizeOf(@typeOf(foo.x));
20801904 \\}
2081 \\comptime {@export("entry", entry);}
20821905 ,
20831906 ".tmp_source.zig:1:13: error: struct 'Foo' contains itself");
20841907
......@@ -2097,18 +1920,16 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
20971920 ".tmp_source.zig:2:15: error: float literal out of range of any type");
20981921
20991922 cases.add("explicit cast float literal to integer when there is a fraction component",
2100 \\extern fn entry() -> i32 {
1923 \\export fn entry() -> i32 {
21011924 \\ i32(12.34)
21021925 \\}
2103 \\comptime {@export("entry", entry);}
21041926 ,
21051927 ".tmp_source.zig:2:9: error: fractional component prevents float value 12.340000 from being casted to type 'i32'");
21061928
21071929 cases.add("non pointer given to @ptrToInt",
2108 \\extern fn entry(x: i32) -> usize {
1930 \\export fn entry(x: i32) -> usize {
21091931 \\ @ptrToInt(x)
21101932 \\}
2111 \\comptime {@export("entry", entry);}
21121933 ,
21131934 ".tmp_source.zig:2:15: error: expected pointer, found 'i32'");
21141935
......@@ -2127,27 +1948,24 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
21271948 ".tmp_source.zig:2:15: error: exact shift shifted out 1 bits");
21281949
21291950 cases.add("shifting without int type or comptime known",
2130 \\extern fn entry(x: u8) -> u8 {
1951 \\export fn entry(x: u8) -> u8 {
21311952 \\ return 0x11 << x;
21321953 \\}
2133 \\comptime {@export("entry", entry);}
21341954 ,
21351955 ".tmp_source.zig:2:17: error: LHS of shift must be an integer type, or RHS must be compile-time known");
21361956
21371957 cases.add("shifting RHS is log2 of LHS int bit width",
2138 \\extern fn entry(x: u8, y: u8) -> u8 {
1958 \\export fn entry(x: u8, y: u8) -> u8 {
21391959 \\ return x << y;
21401960 \\}
2141 \\comptime {@export("entry", entry);}
21421961 ,
21431962 ".tmp_source.zig:2:17: error: expected type 'u3', found 'u8'");
21441963
21451964 cases.add("globally shadowing a primitive type",
21461965 \\const u16 = @intType(false, 8);
2147 \\extern fn entry() {
1966 \\export fn entry() {
21481967 \\ const a: u16 = 300;
21491968 \\}
2150 \\comptime {@export("entry", entry);}
21511969 ,
21521970 ".tmp_source.zig:1:1: error: declaration shadows type 'u16'");
21531971
......@@ -2157,7 +1975,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
21571975 \\ b: u32,
21581976 \\};
21591977 \\
2160 \\extern fn entry() {
1978 \\export fn entry() {
21611979 \\ var foo = Foo { .a = 1, .b = 10 };
21621980 \\ bar(&foo.b);
21631981 \\}
......@@ -2165,7 +1983,6 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
21651983 \\fn bar(x: &u32) {
21661984 \\ *x += 1;
21671985 \\}
2168 \\comptime {@export("entry", entry);}
21691986 ,
21701987 ".tmp_source.zig:8:13: error: expected type '&u32', found '&align(1) u32'");
21711988
......@@ -2175,7 +1992,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
21751992 \\ b: u32,
21761993 \\};
21771994 \\
2178 \\extern fn entry() {
1995 \\export fn entry() {
21791996 \\ var foo = Foo { .a = 1, .b = 10 };
21801997 \\ foo.b += 1;
21811998 \\ bar((&foo.b)[0..1]);
......@@ -2184,61 +2001,55 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
21842001 \\fn bar(x: []u32) {
21852002 \\ x[0] += 1;
21862003 \\}
2187 \\comptime {@export("entry", entry);}
21882004 ,
21892005 ".tmp_source.zig:9:17: error: expected type '[]u32', found '[]align(1) u32'");
21902006
21912007 cases.add("increase pointer alignment in @ptrCast",
2192 \\extern fn entry() -> u32 {
2008 \\export fn entry() -> u32 {
21932009 \\ var bytes: [4]u8 = []u8{0x01, 0x02, 0x03, 0x04};
21942010 \\ const ptr = @ptrCast(&u32, &bytes[0]);
21952011 \\ return *ptr;
21962012 \\}
2197 \\comptime {@export("entry", entry);}
21982013 ,
21992014 ".tmp_source.zig:3:17: error: cast increases pointer alignment",
22002015 ".tmp_source.zig:3:38: note: '&u8' has alignment 1",
22012016 ".tmp_source.zig:3:27: note: '&u32' has alignment 4");
22022017
22032018 cases.add("increase pointer alignment in slice resize",
2204 \\extern fn entry() -> u32 {
2019 \\export fn entry() -> u32 {
22052020 \\ var bytes = []u8{0x01, 0x02, 0x03, 0x04};
22062021 \\ return ([]u32)(bytes[0..])[0];
22072022 \\}
2208 \\comptime {@export("entry", entry);}
22092023 ,
22102024 ".tmp_source.zig:3:19: error: cast increases pointer alignment",
22112025 ".tmp_source.zig:3:19: note: '[]u8' has alignment 1",
22122026 ".tmp_source.zig:3:19: note: '[]u32' has alignment 4");
22132027
22142028 cases.add("@alignCast expects pointer or slice",
2215 \\extern fn entry() {
2029 \\export fn entry() {
22162030 \\ @alignCast(4, u32(3))
22172031 \\}
2218 \\comptime {@export("entry", entry);}
22192032 ,
22202033 ".tmp_source.zig:2:22: error: expected pointer or slice, found 'u32'");
22212034
22222035 cases.add("passing an under-aligned function pointer",
2223 \\extern fn entry() {
2036 \\export fn entry() {
22242037 \\ testImplicitlyDecreaseFnAlign(alignedSmall, 1234);
22252038 \\}
22262039 \\fn testImplicitlyDecreaseFnAlign(ptr: fn () align(8) -> i32, answer: i32) {
22272040 \\ if (ptr() != answer) unreachable;
22282041 \\}
22292042 \\fn alignedSmall() align(4) -> i32 { 1234 }
2230 \\comptime {@export("entry", entry);}
22312043 ,
22322044 ".tmp_source.zig:2:35: error: expected type 'fn() align(8) -> i32', found 'fn() align(4) -> i32'");
22332045
22342046 cases.add("passing a not-aligned-enough pointer to cmpxchg",
22352047 \\const AtomicOrder = @import("builtin").AtomicOrder;
2236 \\extern fn entry() -> bool {
2048 \\export fn entry() -> bool {
22372049 \\ var x: i32 align(1) = 1234;
22382050 \\ while (!@cmpxchg(&x, 1234, 5678, AtomicOrder.SeqCst, AtomicOrder.SeqCst)) {}
22392051 \\ return x == 5678;
22402052 \\}
2241 \\comptime {@export("entry", entry);}
22422053 ,
22432054 ".tmp_source.zig:4:23: error: expected pointer alignment of at least 4, found 1");
22442055
......@@ -2264,18 +2075,17 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
22642075 cases.add("wrong pointer implicitly casted to pointer to @OpaqueType()",
22652076 \\const Derp = @OpaqueType();
22662077 \\extern fn bar(d: &Derp);
2267 \\extern fn foo() {
2078 \\export fn foo() {
22682079 \\ const x = u8(1);
22692080 \\ bar(@ptrCast(&c_void, &x));
22702081 \\}
2271 \\comptime {@export("foo", foo);}
22722082 ,
22732083 ".tmp_source.zig:5:9: error: expected type '&Derp', found '&c_void'");
22742084
22752085 cases.add("non-const variables of things that require const variables",
22762086 \\const Opaque = @OpaqueType();
22772087 \\
2278 \\extern fn entry(opaque: &Opaque) {
2088 \\export fn entry(opaque: &Opaque) {
22792089 \\ var m2 = &2;
22802090 \\ const y: u32 = *m2;
22812091 \\
......@@ -2295,7 +2105,6 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
22952105 \\const Foo = struct {
22962106 \\ fn bar(self: &const Foo) {}
22972107 \\};
2298 \\comptime {@export("entry", entry);}
22992108 ,
23002109 ".tmp_source.zig:4:4: error: variable of type '&const (integer literal)' must be const or comptime",
23012110 ".tmp_source.zig:7:4: error: variable of type '(undefined)' must be const or comptime",
......@@ -2310,14 +2119,21 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
23102119 ".tmp_source.zig:17:4: error: unreachable code");
23112120
23122121 cases.add("wrong types given to atomic order args in cmpxchg",
2313 \\extern fn entry() {
2122 \\export fn entry() {
23142123 \\ var x: i32 = 1234;
23152124 \\ while (!@cmpxchg(&x, 1234, 5678, u32(1234), u32(1234))) {}
23162125 \\}
2317 \\comptime {@export("entry", entry);}
23182126 ,
23192127 ".tmp_source.zig:3:41: error: expected type 'AtomicOrder', found 'u32'");
23202128
2129 cases.add("wrong types given to @export",
2130 \\extern fn entry() { }
2131 \\comptime {
2132 \\ @export("entry", entry, u32(1234));
2133 \\}
2134 ,
2135 ".tmp_source.zig:3:32: error: expected type 'GlobalLinkage', found 'u32'");
2136
23212137 cases.add("struct with invalid field",
23222138 \\const std = @import("std");
23232139 \\const Allocator = std.mem.Allocator;
......@@ -2336,13 +2152,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
23362152 \\ },
23372153 \\};
23382154 \\
2339 \\extern fn entry() {
2155 \\export fn entry() {
23402156 \\ const a = MdNode.Header {
23412157 \\ .text = MdText.init(&std.debug.global_allocator),
23422158 \\ .weight = HeaderWeight.H1,
23432159 \\ };
23442160 \\}
2345 \\comptime {@export("entry", entry);}
23462161 ,
23472162 ".tmp_source.zig:14:17: error: use of undeclared identifier 'HeaderValue'");
23482163
......@@ -2354,39 +2169,35 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
23542169 ".tmp_source.zig:2:5: error: @setAlignStack outside function");
23552170
23562171 cases.add("@setAlignStack in naked function",
2357 \\nakedcc fn entry() {
2172 \\export nakedcc fn entry() {
23582173 \\ @setAlignStack(16);
23592174 \\}
2360 \\comptime {@export("entry", entry);}
23612175 ,
23622176 ".tmp_source.zig:2:5: error: @setAlignStack in naked function");
23632177
23642178 cases.add("@setAlignStack in inline function",
2365 \\extern fn entry() {
2179 \\export fn entry() {
23662180 \\ foo();
23672181 \\}
23682182 \\inline fn foo() {
23692183 \\ @setAlignStack(16);
23702184 \\}
2371 \\comptime {@export("entry", entry);}
23722185 ,
23732186 ".tmp_source.zig:5:5: error: @setAlignStack in inline function");
23742187
23752188 cases.add("@setAlignStack set twice",
2376 \\extern fn entry() {
2189 \\export fn entry() {
23772190 \\ @setAlignStack(16);
23782191 \\ @setAlignStack(16);
23792192 \\}
2380 \\comptime {@export("entry", entry);}
23812193 ,
23822194 ".tmp_source.zig:3:5: error: alignstack set twice",
23832195 ".tmp_source.zig:2:5: note: first set here");
23842196
23852197 cases.add("@setAlignStack too big",
2386 \\extern fn entry() {
2198 \\export fn entry() {
23872199 \\ @setAlignStack(511 + 1);
23882200 \\}
2389 \\comptime {@export("entry", entry);}
23902201 ,
23912202 ".tmp_source.zig:2:5: error: attempt to @setAlignStack(512); maximum is 256");
23922203
......@@ -2417,7 +2228,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
24172228 \\ LinkLibC,
24182229 \\};
24192230 \\
2420 \\extern fn entry() {
2231 \\export fn entry() {
24212232 \\ const tests = []TestCase {
24222233 \\ Free("001"),
24232234 \\ Free("002"),
......@@ -2432,14 +2243,13 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
24322243 \\ }
24332244 \\ }
24342245 \\}
2435 \\comptime {@export("entry", entry);}
24362246 ,
24372247 ".tmp_source.zig:37:16: error: cannot store runtime value in compile time variable");
24382248
24392249 cases.add("field access of opaque type",
24402250 \\const MyType = @OpaqueType();
24412251 \\
2442 \\extern fn entry() -> bool {
2252 \\export fn entry() -> bool {
24432253 \\ var x: i32 = 1;
24442254 \\ return bar(@ptrCast(&MyType, &x));
24452255 \\}
......@@ -2447,7 +2257,6 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
24472257 \\fn bar(x: &MyType) -> bool {
24482258 \\ return x.blah;
24492259 \\}
2450 \\comptime {@export("entry", entry);}
24512260 ,
24522261 ".tmp_source.zig:9:13: error: type '&MyType' does not support field access");
24532262
......@@ -2551,11 +2360,10 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
25512360 ".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members");
25522361
25532362 cases.add("calling var args extern function, passing array instead of pointer",
2554 \\extern fn entry() {
2363 \\export fn entry() {
25552364 \\ foo("hello");
25562365 \\}
25572366 \\pub extern fn foo(format: &const u8, ...);
2558 \\comptime {@export("entry", entry);}
25592367 ,
25602368 ".tmp_source.zig:2:9: error: expected type '&const u8', found '[5]u8'");
25612369
......@@ -2570,10 +2378,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
25702378 \\ }
25712379 \\}
25722380 \\
2573 \\extern fn entry() {
2381 \\export fn entry() {
25742382 \\ var allocator: ContextAllocator = undefined;
25752383 \\}
2576 \\comptime {@export("entry", entry);}
25772384 ,
25782385 ".tmp_source.zig:4:25: error: aoeu",
25792386 ".tmp_source.zig:1:36: note: called from here",
......@@ -2588,10 +2395,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
25882395 \\ Five,
25892396 \\};
25902397 \\
2591 \\extern fn entry() {
2398 \\export fn entry() {
25922399 \\ var x = Small.One;
25932400 \\}
2594 \\comptime {@export("entry", entry);}
25952401 ,
25962402 ".tmp_source.zig:1:20: error: 'u2' too small to hold all bits; must be at least 'u3'");
25972403
......@@ -2602,10 +2408,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
26022408 \\ Three,
26032409 \\};
26042410 \\
2605 \\extern fn entry() {
2411 \\export fn entry() {
26062412 \\ var x = Small.One;
26072413 \\}
2608 \\comptime {@export("entry", entry);}
26092414 ,
26102415 ".tmp_source.zig:1:20: error: expected integer, found 'f32'");
26112416
......@@ -2617,10 +2422,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
26172422 \\ Four,
26182423 \\};
26192424 \\
2620 \\extern fn entry() {
2425 \\export fn entry() {
26212426 \\ var x: u2 = Small.Two;
26222427 \\}
2623 \\comptime {@export("entry", entry);}
26242428 ,
26252429 ".tmp_source.zig:9:22: error: expected type 'u2', found 'Small'");
26262430
......@@ -2632,10 +2436,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
26322436 \\ Four,
26332437 \\};
26342438 \\
2635 \\extern fn entry() {
2439 \\export fn entry() {
26362440 \\ var x = u3(Small.Two);
26372441 \\}
2638 \\comptime {@export("entry", entry);}
26392442 ,
26402443 ".tmp_source.zig:9:15: error: enum to integer cast to 'u3' instead of its tag type, 'u2'");
26412444
......@@ -2647,11 +2450,10 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
26472450 \\ Four,
26482451 \\};
26492452 \\
2650 \\extern fn entry() {
2453 \\export fn entry() {
26512454 \\ var y = u3(3);
26522455 \\ var x = Small(y);
26532456 \\}
2654 \\comptime {@export("entry", entry);}
26552457 ,
26562458 ".tmp_source.zig:10:18: error: integer to enum cast from 'u3' instead of its tag type, 'u2'");
26572459
......@@ -2663,10 +2465,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
26632465 \\ Four,
26642466 \\};
26652467 \\
2666 \\extern fn entry() {
2468 \\export fn entry() {
26672469 \\ var y = Small.Two;
26682470 \\}
2669 \\comptime {@export("entry", entry);}
26702471 ,
26712472 ".tmp_source.zig:1:19: error: expected unsigned integer, found 'i2'");
26722473
......@@ -2674,10 +2475,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
26742475 \\const MultipleChoice = struct {
26752476 \\ A: i32 = 20,
26762477 \\};
2677 \\extern fn entry() {
2478 \\export fn entry() {
26782479 \\ var x: MultipleChoice = undefined;
26792480 \\}
2680 \\comptime {@export("entry", entry);}
26812481 ,
26822482 ".tmp_source.zig:2:14: error: enums, not structs, support field assignment");
26832483
......@@ -2685,29 +2485,26 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
26852485 \\const MultipleChoice = union {
26862486 \\ A: i32 = 20,
26872487 \\};
2688 \\extern fn entry() {
2488 \\export fn entry() {
26892489 \\ var x: MultipleChoice = undefined;
26902490 \\}
2691 \\comptime {@export("entry", entry);}
26922491 ,
26932492 ".tmp_source.zig:2:14: error: non-enum union field assignment",
26942493 ".tmp_source.zig:1:24: note: consider 'union(enum)' here");
26952494
26962495 cases.add("enum with 0 fields",
26972496 \\const Foo = enum {};
2698 \\extern fn entry() -> usize {
2497 \\export fn entry() -> usize {
26992498 \\ return @sizeOf(Foo);
27002499 \\}
2701 \\comptime {@export("entry", entry);}
27022500 ,
27032501 ".tmp_source.zig:1:13: error: enums must have 1 or more fields");
27042502
27052503 cases.add("union with 0 fields",
27062504 \\const Foo = union {};
2707 \\extern fn entry() -> usize {
2505 \\export fn entry() -> usize {
27082506 \\ return @sizeOf(Foo);
27092507 \\}
2710 \\comptime {@export("entry", entry);}
27112508 ,
27122509 ".tmp_source.zig:1:13: error: unions must have 1 or more fields");
27132510
......@@ -2719,10 +2516,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
27192516 \\ D = 1000,
27202517 \\ E = 60,
27212518 \\};
2722 \\extern fn entry() {
2519 \\export fn entry() {
27232520 \\ var x = MultipleChoice.C;
27242521 \\}
2725 \\comptime {@export("entry", entry);}
27262522 ,
27272523 ".tmp_source.zig:6:9: error: enum tag value 60 already taken",
27282524 ".tmp_source.zig:4:9: note: other occurrence here");
......@@ -2737,10 +2533,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
27372533 \\ A: i32,
27382534 \\ B: f64,
27392535 \\};
2740 \\extern fn entry() -> usize {
2536 \\export fn entry() -> usize {
27412537 \\ return @sizeOf(Payload);
27422538 \\}
2743 \\comptime {@export("entry", entry);}
27442539 ,
27452540 ".tmp_source.zig:6:17: error: enum field missing: 'C'",
27462541 ".tmp_source.zig:4:5: note: declared here");
......@@ -2749,10 +2544,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
27492544 \\const Foo = union {
27502545 \\ A: i32,
27512546 \\};
2752 \\extern fn entry() {
2547 \\export fn entry() {
27532548 \\ const x = @TagType(Foo);
27542549 \\}
2755 \\comptime {@export("entry", entry);}
27562550 ,
27572551 ".tmp_source.zig:5:24: error: union 'Foo' has no tag",
27582552 ".tmp_source.zig:1:13: note: consider 'union(enum)' here");
......@@ -2761,10 +2555,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
27612555 \\const Foo = union(enum(f32)) {
27622556 \\ A: i32,
27632557 \\};
2764 \\extern fn entry() {
2558 \\export fn entry() {
27652559 \\ const x = @TagType(Foo);
27662560 \\}
2767 \\comptime {@export("entry", entry);}
27682561 ,
27692562 ".tmp_source.zig:1:23: error: expected integer tag type, found 'f32'");
27702563
......@@ -2772,10 +2565,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
27722565 \\const Foo = union(u32) {
27732566 \\ A: i32,
27742567 \\};
2775 \\extern fn entry() {
2568 \\export fn entry() {
27762569 \\ const x = @TagType(Foo);
27772570 \\}
2778 \\comptime {@export("entry", entry);}
27792571 ,
27802572 ".tmp_source.zig:1:18: error: expected enum tag type, found 'u32'");
27812573
......@@ -2787,10 +2579,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
27872579 \\ D = 1000,
27882580 \\ E = 60,
27892581 \\};
2790 \\extern fn entry() {
2582 \\export fn entry() {
27912583 \\ var x = MultipleChoice { .C = {} };
27922584 \\}
2793 \\comptime {@export("entry", entry);}
27942585 ,
27952586 ".tmp_source.zig:6:9: error: enum tag value 60 already taken",
27962587 ".tmp_source.zig:4:9: note: other occurrence here");
......@@ -2807,10 +2598,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
28072598 \\ C: bool,
28082599 \\ D: bool,
28092600 \\};
2810 \\extern fn entry() {
2601 \\export fn entry() {
28112602 \\ var a = Payload {.A = 1234};
28122603 \\}
2813 \\comptime {@export("entry", entry);}
28142604 ,
28152605 ".tmp_source.zig:10:5: error: enum field not found: 'D'",
28162606 ".tmp_source.zig:1:16: note: enum declared here");
......@@ -2821,10 +2611,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
28212611 \\ B,
28222612 \\ C,
28232613 \\};
2824 \\extern fn entry() {
2614 \\export fn entry() {
28252615 \\ var b = Letter.B;
28262616 \\}
2827 \\comptime {@export("entry", entry);}
28282617 ,
28292618 ".tmp_source.zig:2:8: error: structs and unions, not enums, support field types",
28302619 ".tmp_source.zig:1:16: note: consider 'union(enum)' here");
......@@ -2833,10 +2622,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
28332622 \\const Letter = struct {
28342623 \\ A,
28352624 \\};
2836 \\extern fn entry() {
2625 \\export fn entry() {
28372626 \\ var a = Letter { .A = {} };
28382627 \\}
2839 \\comptime {@export("entry", entry);}
28402628 ,
28412629 ".tmp_source.zig:2:5: error: struct field missing type");
28422630
......@@ -2844,10 +2632,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
28442632 \\const Letter = extern union {
28452633 \\ A,
28462634 \\};
2847 \\extern fn entry() {
2635 \\export fn entry() {
28482636 \\ var a = Letter { .A = {} };
28492637 \\}
2850 \\comptime {@export("entry", entry);}
28512638 ,
28522639 ".tmp_source.zig:2:5: error: union field missing type");
28532640
......@@ -2862,10 +2649,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
28622649 \\ B: f64,
28632650 \\ C: bool,
28642651 \\};
2865 \\extern fn entry() {
2652 \\export fn entry() {
28662653 \\ var a = Payload { .A = { 1234 } };
28672654 \\}
2868 \\comptime {@export("entry", entry);}
28692655 ,
28702656 ".tmp_source.zig:6:29: error: extern union does not support enum tag type");
28712657
......@@ -2880,10 +2666,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
28802666 \\ B: f64,
28812667 \\ C: bool,
28822668 \\};
2883 \\extern fn entry() {
2669 \\export fn entry() {
28842670 \\ var a = Payload { .A = { 1234 } };
28852671 \\}
2886 \\comptime {@export("entry", entry);}
28872672 ,
28882673 ".tmp_source.zig:6:29: error: packed union does not support enum tag type");
28892674
......@@ -2893,7 +2678,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
28932678 \\ B: f64,
28942679 \\ C: bool,
28952680 \\};
2896 \\extern fn entry() {
2681 \\export fn entry() {
28972682 \\ const a = Payload { .A = { 1234 } };
28982683 \\ foo(a);
28992684 \\}
......@@ -2903,7 +2688,6 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
29032688 \\ else => unreachable,
29042689 \\ }
29052690 \\}
2906 \\comptime {@export("entry", entry);}
29072691 ,
29082692 ".tmp_source.zig:11:13: error: switch on union which has no attached enum",
29092693 ".tmp_source.zig:1:17: note: consider 'union(enum)' here");
......@@ -2913,10 +2697,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
29132697 \\ A = 10,
29142698 \\ B = 11,
29152699 \\};
2916 \\extern fn entry() {
2700 \\export fn entry() {
29172701 \\ var x = Foo(0);
29182702 \\}
2919 \\comptime {@export("entry", entry);}
29202703 ,
29212704 ".tmp_source.zig:6:16: error: enum 'Foo' has no tag matching integer value 0",
29222705 ".tmp_source.zig:1:13: note: 'Foo' declared here");
......@@ -2928,10 +2711,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
29282711 \\ B,
29292712 \\ C,
29302713 \\};
2931 \\extern fn entry() {
2714 \\export fn entry() {
29322715 \\ var x: Value = Letter.A;
29332716 \\}
2934 \\comptime {@export("entry", entry);}
29352717 ,
29362718 ".tmp_source.zig:8:26: error: cast to union 'Value' must initialize 'i32' field 'A'",
29372719 ".tmp_source.zig:3:5: note: field 'A' declared here");
......@@ -2943,36 +2725,13 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
29432725 \\ B,
29442726 \\ C,
29452727 \\};
2946 \\extern fn entry() {
2728 \\export fn entry() {
29472729 \\ foo(Letter.A);
29482730 \\}
29492731 \\fn foo(l: Letter) {
29502732 \\ var x: Value = l;
29512733 \\}
2952 \\comptime {@export("entry", entry);}
29532734 ,
29542735 ".tmp_source.zig:11:20: error: runtime cast to union 'Value' which has non-void fields",
29552736 ".tmp_source.zig:3:5: note: field 'A' has type 'i32'");
2956
2957 cases.addCase({
2958 const tc = cases.create("export collision",
2959 \\const foo = @import("foo.zig");
2960 \\
2961 \\comptime {@export("bar", bar);}
2962 \\extern fn bar() -> usize {
2963 \\ return foo.baz;
2964 \\}
2965 ,
2966 "foo.zig:2:11: error: exported symbol collision: 'bar'",
2967 ".tmp_source.zig:3:11: note: other symbol is here");
2968
2969 tc.addSourceFile("foo.zig",
2970 \\extern fn bar() {}
2971 \\comptime {@export("bar", bar);}
2972 \\pub const baz = 1234;
2973 );
2974
2975 tc
2976 });
2977
29782737}
test/standalone/issue_339/test.zig+1-4
......@@ -2,9 +2,6 @@ pub fn panic(msg: []const u8) -> noreturn { @breakpoint(); while (true) {} }
22
33fn bar() -> %void {}
44
5comptime {
6 @export("foo", foo);
7}
8extern fn foo() {
5export fn foo() {
96 %%bar();
107}
test/translate_c.zig+32-32
......@@ -26,7 +26,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
2626 \\ return a < 0 ? -a : a;
2727 \\}
2828 ,
29 \\pub fn abs(a: c_int) -> c_int {
29 \\export fn abs(a: c_int) -> c_int {
3030 \\ return if (a < 0) -a else a;
3131 \\}
3232 );
......@@ -325,12 +325,12 @@ pub fn addCases(cases: &tests.TranslateCContext) {
325325 \\ return a;
326326 \\}
327327 ,
328 \\pub fn foo1(_arg_a: c_uint) -> c_uint {
328 \\pub export fn foo1(_arg_a: c_uint) -> c_uint {
329329 \\ var a = _arg_a;
330330 \\ a +%= 1;
331331 \\ return a;
332332 \\}
333 \\pub fn foo2(_arg_a: c_int) -> c_int {
333 \\pub export fn foo2(_arg_a: c_int) -> c_int {
334334 \\ var a = _arg_a;
335335 \\ a += 1;
336336 \\ return a;
......@@ -346,7 +346,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
346346 \\ return i;
347347 \\}
348348 ,
349 \\pub fn log2(_arg_a: c_uint) -> c_int {
349 \\pub export fn log2(_arg_a: c_uint) -> c_int {
350350 \\ var a = _arg_a;
351351 \\ var i: c_int = 0;
352352 \\ while (a > c_uint(0)) {
......@@ -367,7 +367,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
367367 \\ return a;
368368 \\}
369369 ,
370 \\pub fn max(a: c_int, b: c_int) -> c_int {
370 \\pub export fn max(a: c_int, b: c_int) -> c_int {
371371 \\ if (a < b) return b;
372372 \\ if (a < b) return b else return a;
373373 \\}
......@@ -382,7 +382,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
382382 \\ return a;
383383 \\}
384384 ,
385 \\pub fn max(a: c_int, b: c_int) -> c_int {
385 \\pub export fn max(a: c_int, b: c_int) -> c_int {
386386 \\ if (a == b) return a;
387387 \\ if (a != b) return b;
388388 \\ return a;
......@@ -407,7 +407,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
407407 \\ c = a % b;
408408 \\}
409409 ,
410 \\pub fn s(a: c_int, b: c_int) -> c_int {
410 \\pub export fn s(a: c_int, b: c_int) -> c_int {
411411 \\ var c: c_int;
412412 \\ c = (a + b);
413413 \\ c = (a - b);
......@@ -415,7 +415,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
415415 \\ c = @divTrunc(a, b);
416416 \\ c = @rem(a, b);
417417 \\}
418 \\pub fn u(a: c_uint, b: c_uint) -> c_uint {
418 \\pub export fn u(a: c_uint, b: c_uint) -> c_uint {
419419 \\ var c: c_uint;
420420 \\ c = (a +% b);
421421 \\ c = (a -% b);
......@@ -430,7 +430,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
430430 \\ return (a & b) ^ (a | b);
431431 \\}
432432 ,
433 \\pub fn max(a: c_int, b: c_int) -> c_int {
433 \\pub export fn max(a: c_int, b: c_int) -> c_int {
434434 \\ return (a & b) ^ (a | b);
435435 \\}
436436 );
......@@ -444,7 +444,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
444444 \\ return a;
445445 \\}
446446 ,
447 \\pub fn max(a: c_int, b: c_int) -> c_int {
447 \\pub export fn max(a: c_int, b: c_int) -> c_int {
448448 \\ if ((a < b) or (a == b)) return b;
449449 \\ if ((a >= b) and (a == b)) return a;
450450 \\ return a;
......@@ -458,7 +458,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
458458 \\ a = tmp;
459459 \\}
460460 ,
461 \\pub fn max(_arg_a: c_int) -> c_int {
461 \\pub export fn max(_arg_a: c_int) -> c_int {
462462 \\ var a = _arg_a;
463463 \\ var tmp: c_int;
464464 \\ tmp = a;
......@@ -472,7 +472,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
472472 \\ c = b = a;
473473 \\}
474474 ,
475 \\pub fn max(a: c_int) {
475 \\pub export fn max(a: c_int) {
476476 \\ var b: c_int;
477477 \\ var c: c_int;
478478 \\ c = {
......@@ -493,7 +493,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
493493 \\ return i;
494494 \\}
495495 ,
496 \\pub fn log2(_arg_a: u32) -> c_int {
496 \\pub export fn log2(_arg_a: u32) -> c_int {
497497 \\ var a = _arg_a;
498498 \\ var i: c_int = 0;
499499 \\ while (a > c_uint(0)) {
......@@ -518,7 +518,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
518518 \\void foo(void) { bar(); }
519519 ,
520520 \\pub fn bar() {}
521 \\pub fn foo() {
521 \\pub export fn foo() {
522522 \\ bar();
523523 \\}
524524 );
......@@ -534,7 +534,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
534534 \\pub const struct_Foo = extern struct {
535535 \\ field: c_int,
536536 \\};
537 \\pub fn read_field(foo: ?&struct_Foo) -> c_int {
537 \\pub export fn read_field(foo: ?&struct_Foo) -> c_int {
538538 \\ return (??foo).field;
539539 \\}
540540 );
......@@ -544,7 +544,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
544544 \\ ;;;;;
545545 \\}
546546 ,
547 \\pub fn foo() {}
547 \\pub export fn foo() {}
548548 );
549549
550550 cases.add("undefined array global",
......@@ -560,7 +560,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
560560 \\}
561561 ,
562562 \\pub var array: [100]c_int = undefined;
563 \\pub fn foo(index: c_int) -> c_int {
563 \\pub export fn foo(index: c_int) -> c_int {
564564 \\ return array[index];
565565 \\}
566566 );
......@@ -571,7 +571,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
571571 \\ return (int)a;
572572 \\}
573573 ,
574 \\pub fn float_to_int(a: f32) -> c_int {
574 \\pub export fn float_to_int(a: f32) -> c_int {
575575 \\ return c_int(a);
576576 \\}
577577 );
......@@ -581,7 +581,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
581581 \\ return x;
582582 \\}
583583 ,
584 \\pub fn foo(x: ?&c_ushort) -> ?&c_void {
584 \\pub export fn foo(x: ?&c_ushort) -> ?&c_void {
585585 \\ return @ptrCast(?&c_void, x);
586586 \\}
587587 );
......@@ -592,7 +592,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
592592 \\ return sizeof(int);
593593 \\}
594594 ,
595 \\pub fn size_of() -> usize {
595 \\pub export fn size_of() -> usize {
596596 \\ return @sizeOf(c_int);
597597 \\}
598598 );
......@@ -602,7 +602,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
602602 \\ return 0;
603603 \\}
604604 ,
605 \\pub fn foo() -> ?&c_int {
605 \\pub export fn foo() -> ?&c_int {
606606 \\ return null;
607607 \\}
608608 );
......@@ -612,7 +612,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
612612 \\ return 1, 2;
613613 \\}
614614 ,
615 \\pub fn foo() -> c_int {
615 \\pub export fn foo() -> c_int {
616616 \\ return {
617617 \\ _ = 1;
618618 \\ 2
......@@ -625,7 +625,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
625625 \\ return (1 << 2) >> 1;
626626 \\}
627627 ,
628 \\pub fn foo() -> c_int {
628 \\pub export fn foo() -> c_int {
629629 \\ return (1 << @import("std").math.Log2Int(c_int)(2)) >> @import("std").math.Log2Int(c_int)(1);
630630 \\}
631631 );
......@@ -643,7 +643,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
643643 \\ a <<= (a <<= 1);
644644 \\}
645645 ,
646 \\pub fn foo() {
646 \\pub export fn foo() {
647647 \\ var a: c_int = 0;
648648 \\ a += {
649649 \\ const _ref = &a;
......@@ -701,7 +701,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
701701 \\ a <<= (a <<= 1);
702702 \\}
703703 ,
704 \\pub fn foo() {
704 \\pub export fn foo() {
705705 \\ var a: c_uint = c_uint(0);
706706 \\ a +%= {
707707 \\ const _ref = &a;
......@@ -771,7 +771,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
771771 \\ u = u--;
772772 \\}
773773 ,
774 \\pub fn foo() {
774 \\pub export fn foo() {
775775 \\ var i: c_int = 0;
776776 \\ var u: c_uint = c_uint(0);
777777 \\ i += 1;
......@@ -819,7 +819,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
819819 \\ u = --u;
820820 \\}
821821 ,
822 \\pub fn foo() {
822 \\pub export fn foo() {
823823 \\ var i: c_int = 0;
824824 \\ var u: c_uint = c_uint(0);
825825 \\ i += 1;
......@@ -862,7 +862,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
862862 \\ while (b != 0);
863863 \\}
864864 ,
865 \\pub fn foo() {
865 \\pub export fn foo() {
866866 \\ var a: c_int = 2;
867867 \\ while (true) {
868868 \\ a -= 1;
......@@ -886,9 +886,9 @@ pub fn addCases(cases: &tests.TranslateCContext) {
886886 \\ baz();
887887 \\}
888888 ,
889 \\pub fn foo() {}
890 \\pub fn baz() {}
891 \\pub fn bar() {
889 \\pub export fn foo() {}
890 \\pub export fn baz() {}
891 \\pub export fn bar() {
892892 \\ var f: ?extern fn() = foo;
893893 \\ (??f)();
894894 \\ (??f)();
......@@ -901,7 +901,7 @@ pub fn addCases(cases: &tests.TranslateCContext) {
901901 \\ *x = 1;
902902 \\}
903903 ,
904 \\pub fn foo(x: ?&c_int) {
904 \\pub export fn foo(x: ?&c_int) {
905905 \\ (*??x) = 1;
906906 \\}
907907 );