mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-09 15:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zig fmt: implement catch and return

Browse source
This commit is contained in:
Isaac Freund 2021-02-07 14:37:12 +01:00 • committed by Andrew Kelley
parent 0929fcbc34
commit bb7b5ee2ac
3 changed files with 51 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/std/zig/ast.zig
View file

@ -436,7 +436,6 @@ pub const Tree = struct {
.Suspend,
.Resume,
.Break,
.Return,
.Nosuspend,
.Comptime,
=> n = datas[n].lhs,
@ -516,6 +515,12 @@ pub const Tree = struct {
.EnumLiteral,
=> return main_tokens[n] + end_offset,
.Return => if (datas[n].lhs != 0) {
n = datas[n].lhs;
} else {
return main_tokens[n] + end_offset;
},
.Call => {
end_offset += 1; // for the rparen
const params = tree.extraData(datas[n].rhs, Node.SubRange);
@ -1791,7 +1796,9 @@ pub const Node = struct {
/// lhs is unused.
/// rhs is the deferred expression.
Defer,
/// lhs is target expr; rhs is fallback expr.
/// lhs catch rhs
/// lhs catch |err| rhs
/// main_token is the catch
/// payload is determined by looking at the prev tokens before rhs.
Catch,
/// `lhs.a`. main_token is the dot. rhs is the identifier token index.

28
lib/std/zig/parser_test.zig
View file

@ -2622,18 +2622,22 @@ test "zig fmt: ptr deref operator and unwrap optional operator" {
// \\
// );
//}
//
//test "zig fmt: catch" {
// try testCanonical(
// \\test "catch" {
// \\ const a: anyerror!u8 = 0;
// \\ _ = a catch return;
// \\ _ = a catch |err| return;
// \\}
// \\
// );
//}
//
test "zig fmt: catch" {
try testCanonical(
\\test "catch" {
\\ const a: anyerror!u8 = 0;
\\ _ = a catch return;
\\ _ = a catch
\\ return;
\\ _ = a catch |err| return;
\\ _ = a catch |err|
\\ return;
\\}
\\
);
}
//test "zig fmt: blocks" {
// try testCanonical(
// \\test "blocks" {

52
lib/std/zig/render.zig
View file

@ -257,27 +257,29 @@ fn renderExpression(ais: *Ais, tree: ast.Tree, node: ast.Node.Index, space: Spac
// }
//},
.Catch => unreachable, // TODO
//.Catch => {
// const infix_op_node = @fieldParentPtr(ast.Node.Catch, "base", base);
.Catch => {
const main_token = main_tokens[node];
const fallback_first = tree.firstToken(datas[node].rhs);
// const op_space = Space.Space;
// try renderExpression(ais, tree, infix_op_node.lhs, op_space);
const same_line = tree.tokensOnSameLine(main_token, fallback_first);
const after_op_space = if (same_line) Space.Space else Space.Newline;
// const after_op_space = blk: {
// const same_line = tree.tokensOnSameLine(infix_op_node.op_token, tree.nextToken(infix_op_node.op_token));
// break :blk if (same_line) op_space else Space.Newline;
// };
try renderExpression(ais, tree, datas[node].lhs, .Space); // target
// try renderToken(ais, tree, infix_op_node.op_token, after_op_space);
if (token_tags[fallback_first - 1] == .Pipe) {
try renderToken(ais, tree, main_token, .Space); // catch keyword
try renderToken(ais, tree, main_token + 1, .None); // pipe
try renderToken(ais, tree, main_token + 2, .None); // payload identifier
try renderToken(ais, tree, main_token + 3, after_op_space); // pipe
} else {
assert(token_tags[fallback_first - 1] == .Keyword_catch);
try renderToken(ais, tree, main_token, after_op_space); // catch keyword
}
// if (infix_op_node.payload) |payload| {
// try renderExpression(ais, tree, payload, Space.Space);
// }
ais.pushIndentOneShot();
try renderExpression(ais, tree, datas[node].rhs, space); // fallback
},
// ais.pushIndentOneShot();
// return renderExpression(ais, tree, infix_op_node.rhs, space);
//},
.FieldAccess => {
const field_access = datas[node];
try renderExpression(ais, tree, field_access.lhs, .None);
@ -516,16 +518,14 @@ fn renderExpression(ais: *Ais, tree: ast.Tree, node: ast.Node.Index, space: Spac
// }
//},
.Return => unreachable, // TODO
//.Return => {
// const flow_expr = base.castTag(.Return).?;
// if (flow_expr.getRHS()) |rhs| {
// try renderToken(ais, tree, flow_expr.ltoken, Space.Space);
// return renderExpression(ais, tree, rhs, space);
// } else {
// return renderToken(ais, tree, flow_expr.ltoken, space);
// }
//},
.Return => {
if (datas[node].lhs != 0) {
try renderToken(ais, tree, main_tokens[node], .Space);
try renderExpression(ais, tree, datas[node].lhs, space);
} else {
try renderToken(ais, tree, main_tokens[node], space);
}
},
.GroupedExpression => unreachable, // TODO
//.GroupedExpression => {