diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-12-22 00:50:30 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-12-22 00:50:30 -0500 |
| commit | d917815d8111b98dc237cbe2c723fa63018e02b1 (patch) | |
| tree | ce12771a86b2412ee9692ca73d3ca49abe5da3ce /test/compare_output.zig | |
| parent | 8bc523219c66427951e5339550502871547f2138 (diff) | |
| download | zig-d917815d8111b98dc237cbe2c723fa63018e02b1.tar.gz zig-d917815d8111b98dc237cbe2c723fa63018e02b1.zip | |
explicitly return from blocks
instead of last statement being expression value
closes #629
Diffstat (limited to 'test/compare_output.zig')
| -rw-r--r-- | test/compare_output.zig | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/test/compare_output.zig b/test/compare_output.zig index ad9c91ff20..88e25bf40c 100644 --- a/test/compare_output.zig +++ b/test/compare_output.zig @@ -10,7 +10,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\} , "Hello, world!" ++ os.line_sep); - cases.addCase({ + cases.addCase(x: { var tc = cases.create("multiple files with private function", \\use @import("std").io; \\use @import("foo.zig"); @@ -41,10 +41,10 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\} ); - tc + break :x tc; }); - cases.addCase({ + cases.addCase(x: { var tc = cases.create("import segregation", \\use @import("foo.zig"); \\use @import("bar.zig"); @@ -82,10 +82,10 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\} ); - tc + break :x tc; }); - cases.addCase({ + cases.addCase(x: { var tc = cases.create("two files use import each other", \\use @import("a.zig"); \\ @@ -112,7 +112,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\pub const b_text = a_text; ); - tc + break :x tc; }); cases.add("hello world without libc", @@ -286,11 +286,11 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\ const a_int = @ptrCast(&align(1) i32, a ?? unreachable); \\ const b_int = @ptrCast(&align(1) i32, b ?? unreachable); \\ if (*a_int < *b_int) { - \\ -1 + \\ return -1; \\ } else if (*a_int > *b_int) { - \\ 1 + \\ return 1; \\ } else { - \\ c_int(0) + \\ return 0; \\ } \\} \\ @@ -342,13 +342,13 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\const Foo = struct { \\ field1: Bar, \\ - \\ fn method(a: &const Foo) -> bool { true } + \\ fn method(a: &const Foo) -> bool { return true; } \\}; \\ \\const Bar = struct { \\ field2: i32, \\ - \\ fn method(b: &const Bar) -> bool { true } + \\ fn method(b: &const Bar) -> bool { return true; } \\}; \\ \\pub fn main() -> %void { @@ -429,7 +429,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) { \\fn its_gonna_pass() -> %void { } , "before\nafter\ndefer3\ndefer1\n"); - cases.addCase({ + cases.addCase(x: { var tc = cases.create("@embedFile", \\const foo_txt = @embedFile("foo.txt"); \\const io = @import("std").io; @@ -442,10 +442,10 @@ pub fn addCases(cases: &tests.CompareOutputContext) { tc.addSourceFile("foo.txt", "1234\nabcd\n"); - tc + break :x tc; }); - cases.addCase({ + cases.addCase(x: { var tc = cases.create("parsing args", \\const std = @import("std"); \\const io = std.io; @@ -483,10 +483,10 @@ pub fn addCases(cases: &tests.CompareOutputContext) { "last arg", }); - tc + break :x tc; }); - cases.addCase({ + cases.addCase(x: { var tc = cases.create("parsing args new API", \\const std = @import("std"); \\const io = std.io; @@ -524,6 +524,6 @@ pub fn addCases(cases: &tests.CompareOutputContext) { "last arg", }); - tc + break :x tc; }); } |
