authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-02-09 20:17:47-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-02-09 20:17:47-07:00
logebf04c56e12c8dd7cf503f042e698984704b14b2
tree8808d81c8c379261ef572914279fcbb9c9f99d21
parent39acc4c02004f4e106b7c280f3f6bb070df88178

zig fmt: usingnamespace

2 files changed, 20 insertions(+), 21 deletions(-)

lib/std/zig/parser_test.zig+9-9
......@@ -3082,15 +3082,15 @@ test "zig fmt: for" {
30823082// \\
30833083// );
30843084//}
3085//
3086//test "zig fmt: use" {
3087// try testCanonical(
3088// \\usingnamespace @import("std");
3089// \\pub usingnamespace @import("std");
3090// \\
3091// );
3092//}
3093//
3085
3086test "zig fmt: usingnamespace" {
3087 try testCanonical(
3088 \\usingnamespace @import("std");
3089 \\pub usingnamespace @import("std");
3090 \\
3091 );
3092}
3093
30943094//test "zig fmt: string identifier" {
30953095// try testCanonical(
30963096// \\const @"a b" = @"c d".@"e f";
lib/std/zig/render.zig+11-12
......@@ -131,20 +131,19 @@ fn renderMember(ais: *Ais, tree: ast.Tree, decl: ast.Node.Index, space: Space) E
131131 .FnProto,
132132 => {
133133 try renderExpression(ais, tree, decl, .None);
134 try renderToken(ais, tree, tree.lastToken(decl) + 1, space); // semicolon
134 return renderToken(ais, tree, tree.lastToken(decl) + 1, space); // semicolon
135135 },
136136
137 .UsingNamespace => unreachable, // TODO
138 // .Use => {
139 // const use_decl = @fieldParentPtr(ast.Node.Use, "base", decl);
140
141 // if (use_decl.visib_token) |visib_token| {
142 // try renderToken(ais, tree, visib_token, .Space); // pub
143 // }
144 // try renderToken(ais, tree, use_decl.use_token, .Space); // usingnamespace
145 // try renderExpression(ais, tree, use_decl.expr, .None);
146 // try renderToken(ais, tree, use_decl.semicolon_token, space); // ;
147 // },
137 .UsingNamespace => {
138 const main_token = main_tokens[decl];
139 const expr = datas[decl].lhs;
140 if (main_token > 0 and token_tags[main_token - 1] == .Keyword_pub) {
141 try renderToken(ais, tree, main_token - 1, .Space); // pub
142 }
143 try renderToken(ais, tree, main_token, .Space); // usingnamespace
144 try renderExpression(ais, tree, expr, .None);
145 return renderToken(ais, tree, tree.lastToken(expr) + 1, space); // ;
146 },
148147
149148 .GlobalVarDecl => return renderVarDecl(ais, tree, tree.globalVarDecl(decl)),
150149 .LocalVarDecl => return renderVarDecl(ais, tree, tree.localVarDecl(decl)),