mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-21 06:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig fmt: usingnamespace

Browse Source
This commit is contained in:
Andrew Kelley 2021-02-09 20:17:47 -07:00
parent 39acc4c020
commit ebf04c56e1
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/std/zig/parser_test.zig
View File

@ -3082,15 +3082,15 @@ test "zig fmt: for" {
// \\
// );
//}
//
//test "zig fmt: use" {
// try testCanonical(
// \\usingnamespace @import("std");
// \\pub usingnamespace @import("std");
// \\
// );
//}
//
test "zig fmt: usingnamespace" {
try testCanonical(
\\usingnamespace @import("std");
\\pub usingnamespace @import("std");
\\
);
}
//test "zig fmt: string identifier" {
// try testCanonical(
// \\const @"a b" = @"c d".@"e f";

23
lib/std/zig/render.zig
View File

@ -131,20 +131,19 @@ fn renderMember(ais: *Ais, tree: ast.Tree, decl: ast.Node.Index, space: Space) E
.FnProto,
=> {
try renderExpression(ais, tree, decl, .None);
try renderToken(ais, tree, tree.lastToken(decl) + 1, space); // semicolon
return renderToken(ais, tree, tree.lastToken(decl) + 1, space); // semicolon
},
.UsingNamespace => unreachable, // TODO
// .Use => {
// const use_decl = @fieldParentPtr(ast.Node.Use, "base", decl);
// if (use_decl.visib_token) |visib_token| {
// try renderToken(ais, tree, visib_token, .Space); // pub
// }
// try renderToken(ais, tree, use_decl.use_token, .Space); // usingnamespace
// try renderExpression(ais, tree, use_decl.expr, .None);
// try renderToken(ais, tree, use_decl.semicolon_token, space); // ;
// },
.UsingNamespace => {
const main_token = main_tokens[decl];
const expr = datas[decl].lhs;
if (main_token > 0 and token_tags[main_token - 1] == .Keyword_pub) {
try renderToken(ais, tree, main_token - 1, .Space); // pub
}
try renderToken(ais, tree, main_token, .Space); // usingnamespace
try renderExpression(ais, tree, expr, .None);
return renderToken(ais, tree, tree.lastToken(expr) + 1, space); // ;
},
.GlobalVarDecl => return renderVarDecl(ais, tree, tree.globalVarDecl(decl)),
.LocalVarDecl => return renderVarDecl(ais, tree, tree.localVarDecl(decl)),