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

4
doc/docgen.zig
View File

@@ -318,7 +318,7 @@ const Action = enum {
fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) -> %Toc {
var urls = std.HashMap([]const u8, Token, mem.hash_slice_u8, mem.eql_slice_u8).init(allocator);
%defer urls.deinit();
errdefer urls.deinit();
var header_stack_size: usize = 0;
var last_action = Action.Open;
@@ -399,7 +399,7 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) -> %Toc {
}
} else if (mem.eql(u8, tag_name, "see_also")) {
var list = std.ArrayList(SeeAlsoItem).init(allocator);
%defer list.deinit();
errdefer list.deinit();
while (true) {
const see_also_tok = tokenizer.next();

14
doc/langref.html.in
View File

@@ -2533,7 +2533,7 @@ test "defer unwinding" {
deferUnwindExample();
}
// The %defer keyword is similar to defer, but will only execute if the
// The errdefer keyword is similar to defer, but will only execute if the
// scope returns with an error.
//
// This is especially useful in allowing a function to clean up properly
@@ -2547,7 +2547,7 @@ fn deferErrorExample(is_error: bool) -> %void {
warn("end of function\n");
}
%defer {
errdefer {
warn("encountered an error!\n");
}
@@ -2556,7 +2556,7 @@ fn deferErrorExample(is_error: bool) -> %void {
}
}
test "%defer unwinding" {
test "errdefer unwinding" {
_ = deferErrorExample(false);
_ = deferErrorExample(true);
}
@@ -2922,7 +2922,7 @@ fn doAThing(str: []u8) {
{#code_end#}
<p>
The other component to error handling is defer statements.
In addition to an unconditional <code>defer</code>, Zig has <code>%defer</code>,
In addition to an unconditional <code>defer</code>, Zig has <code>errdefer</code>,
which evaluates the deferred expression on block exit path if and only if
the function returned with an error from the block.
</p>
@@ -2934,7 +2934,7 @@ fn createFoo(param: i32) -> %Foo {
const foo = try tryToAllocateFoo();
// now we have allocated foo. we need to free it if the function fails.
// but we want to return it if the function succeeds.
%defer deallocateFoo(foo);
errdefer deallocateFoo(foo);
const tmp_buf = allocateTmpBuffer() ?? return error.OutOfMemory;
// tmp_buf is truly a temporary resource, and we for sure want to clean it up
@@ -2943,7 +2943,7 @@ fn createFoo(param: i32) -> %Foo {
if (param > 1337) return error.InvalidParam;
// here the %defer will not run since we're returning success from the function.
// here the errdefer will not run since we're returning success from the function.
// but the defer will run!
return foo;
}
@@ -5619,7 +5619,7 @@ TryExpression = "try" Expression
BreakExpression = "break" option(":" Symbol) option(Expression)
Defer(body) = option("%") "defer" body
Defer(body) = ("defer" | "deferror") body
IfExpression(body) = "if" "(" Expression ")" body option("else" BlockExpression(body))