motiejus/zig
1
Fork 0
Code Releases Activity

replace %defer with errdefer

Browse Source 
See #632

now we have 1 less sigil
This commit is contained in:
Andrew Kelley
2018-01-23 23:08:09 -05:00
parent ad2527d47a
commit b3a6faf13e
21 changed files with 87 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/cases/defer.zig
View File

@@ -8,7 +8,7 @@ error FalseNotAllowed;
fn runSomeErrorDefers(x: bool) -> %bool {
index = 0;
defer {result[index] = 'a'; index += 1;}
%defer {result[index] = 'b'; index += 1;}
errdefer {result[index] = 'b'; index += 1;}
defer {result[index] = 'c'; index += 1;}
return if (x) x else error.FalseNotAllowed;
}

8
test/compare_output.zig
View File

@@ -392,7 +392,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
\\}
, "before\ndefer2\ndefer1\n");
cases.add("%defer and it fails",
cases.add("errdefer and it fails",
\\const io = @import("std").io;
\\pub fn main() -> %void {
\\ do_test() catch return;
@@ -401,7 +401,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
\\ const stdout = &(io.FileOutStream.init(&(io.getStdOut() catch unreachable)).stream);
\\ stdout.print("before\n") catch unreachable;
\\ defer stdout.print("defer1\n") catch unreachable;
\\ %defer stdout.print("deferErr\n") catch unreachable;
\\ errdefer stdout.print("deferErr\n") catch unreachable;
\\ try its_gonna_fail();
\\ defer stdout.print("defer3\n") catch unreachable;
\\ stdout.print("after\n") catch unreachable;
@@ -412,7 +412,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
\\}
, "before\ndeferErr\ndefer1\n");
cases.add("%defer and it passes",
cases.add("errdefer and it passes",
\\const io = @import("std").io;
\\pub fn main() -> %void {
\\ do_test() catch return;
@@ -421,7 +421,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) {
\\ const stdout = &(io.FileOutStream.init(&(io.getStdOut() catch unreachable)).stream);
\\ stdout.print("before\n") catch unreachable;
\\ defer stdout.print("defer1\n") catch unreachable;
\\ %defer stdout.print("deferErr\n") catch unreachable;
\\ errdefer stdout.print("deferErr\n") catch unreachable;
\\ try its_gonna_pass();
\\ defer stdout.print("defer3\n") catch unreachable;
\\ stdout.print("after\n") catch unreachable;