mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address Spaces: fmt a bunch of stuff

Browse Source
This commit is contained in:
Robin Voetter 2021-08-29 19:41:57 +02:00
parent ea393b2bca
commit 68fcbb5c0d
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,7 +958,8 @@ fn renderVarDecl(gpa: *Allocator, ais: *Ais, tree: Ast, var_decl: Ast.full.VarDe
try renderToken(ais, tree, lparen, Space.none); // ( try renderToken(ais, tree, lparen, Space.none); // (
try renderExpression(gpa, ais, tree, var_decl.ast.align_node, Space.none); try renderExpression(gpa, ais, tree, var_decl.ast.align_node, Space.none);
if (var_decl.ast.addrspace_node != 0 or var_decl.ast.section_node != 0 or if (var_decl.ast.addrspace_node != 0 or var_decl.ast.section_node != 0 or
var_decl.ast.init_node != 0) { var_decl.ast.init_node != 0)
{
try renderToken(ais, tree, rparen, .space); // ) try renderToken(ais, tree, rparen, .space); // )
} else { } else {
try renderToken(ais, tree, rparen, .none); // ) try renderToken(ais, tree, rparen, .none); // )

4
src/AstGen.zig
View File

@ -2393,11 +2393,11 @@ fn varDecl(
} }
if (var_decl.ast.addrspace_node != 0) { if (var_decl.ast.addrspace_node != 0) {
return astgen.failTok(main_tokens[var_decl.ast.addrspace_node], "cannot set address space of local variable '{s}'", .{ ident_name_raw }); return astgen.failTok(main_tokens[var_decl.ast.addrspace_node], "cannot set address space of local variable '{s}'", .{ident_name_raw});
} }
if (var_decl.ast.section_node != 0) { if (var_decl.ast.section_node != 0) {
return astgen.failTok(main_tokens[var_decl.ast.section_node], "cannot set section of local variable '{s}'", .{ ident_name_raw }); return astgen.failTok(main_tokens[var_decl.ast.section_node], "cannot set section of local variable '{s}'", .{ident_name_raw});
} }
const align_inst: Zir.Inst.Ref = if (var_decl.ast.align_node != 0) const align_inst: Zir.Inst.Ref = if (var_decl.ast.align_node != 0)

2
src/Zir.zig
View File

@ -4029,7 +4029,7 @@ const Writer = struct {
}; };
const addrspace_inst: Inst.Ref = if (!has_section_or_addrspace) .none else inst: { const addrspace_inst: Inst.Ref = if (!has_section_or_addrspace) .none else inst: {
const inst = @intToEnum(Inst.Ref, self.code.extra[extra_index]); const inst = @intToEnum(Inst.Ref, self.code.extra[extra_index]);
extra_index +=1; extra_index += 1;
break :inst inst; break :inst inst;
}; };
const pub_str = if (is_pub) "pub " else ""; const pub_str = if (is_pub) "pub " else "";

10
src/type.zig
View File

@ -1002,7 +1002,7 @@ pub const Type = extern union {
try writer.writeAll(@tagName(payload.cc)); try writer.writeAll(@tagName(payload.cc));
try writer.writeAll(") "); try writer.writeAll(") ");
if (payload.@"addrspace" != .generic) { if (payload.@"addrspace" != .generic) {
try writer.print("addrspace(.{s}) ", .{ @tagName(payload.@"addrspace") }); try writer.print("addrspace(.{s}) ", .{@tagName(payload.@"addrspace")});
} }
ty = payload.return_type; ty = payload.return_type;
continue; continue;
@ -1136,7 +1136,7 @@ pub const Type = extern union {
try writer.writeAll(") "); try writer.writeAll(") ");
} }
if (payload.@"addrspace" != .generic) { if (payload.@"addrspace" != .generic) {
try writer.print("addrspace(.{s}) ", .{ @tagName(payload.@"addrspace") }); try writer.print("addrspace(.{s}) ", .{@tagName(payload.@"addrspace")});
} }
if (!payload.mutable) try writer.writeAll("const "); if (!payload.mutable) try writer.writeAll("const ");
if (payload.@"volatile") try writer.writeAll("volatile "); if (payload.@"volatile") try writer.writeAll("volatile ");
@ -2197,8 +2197,8 @@ pub const Type = extern union {
payload.bit_offset != 0 or payload.bit_offset != 0 or
payload.host_size != 0 or payload.host_size != 0 or
payload.@"allowzero" or payload.@"allowzero" or
payload.@"volatile" payload.@"volatile")
) { {
buffer.pointer = .{ buffer.pointer = .{
.data = .{ .data = .{
.pointee_type = payload.pointee_type, .pointee_type = payload.pointee_type,
@ -2210,7 +2210,7 @@ pub const Type = extern union {
.@"allowzero" = payload.@"allowzero", .@"allowzero" = payload.@"allowzero",
.mutable = payload.mutable, .mutable = payload.mutable,
.@"volatile" = payload.@"volatile", .@"volatile" = payload.@"volatile",
.size = .Many .size = .Many,
}, },
}; };
return Type.initPayload(&buffer.pointer.base); return Type.initPayload(&buffer.pointer.base);

4
test/cases.zig
View File

@ -861,7 +861,7 @@ pub fn addCases(ctx: *TestContext) !void {
"Hello, World!\n", "Hello, World!\n",
); );
try case.files.append(.{ try case.files.append(.{
.src = .src =
\\pub fn print() void { \\pub fn print() void {
\\ asm volatile ("syscall" \\ asm volatile ("syscall"
\\ : \\ :
@ -924,7 +924,7 @@ pub fn addCases(ctx: *TestContext) !void {
}, },
); );
try case.files.append(.{ try case.files.append(.{
.src = .src =
\\// dummy comment to make print be on line 2 \\// dummy comment to make print be on line 2
\\fn print() void { \\fn print() void {
\\ asm volatile ("syscall" \\ asm volatile ("syscall"