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

Avoid identifier conflicts with reserved C keywords

Browse Source
This commit is contained in:
Cody Tapscott 2022-01-24 12:00:01 -07:00
parent 799bd81b08
commit 52517e86d6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/codegen/c.zig
View File

@ -34,6 +34,8 @@ pub const CValue = union(enum) {
/// By-value /// By-value
decl: *Decl, decl: *Decl,
decl_ref: *Decl, decl_ref: *Decl,
/// Render the slice as an identifier (using fmtIdent)
identifier: []const u8,
/// Render these bytes literally. /// Render these bytes literally.
/// TODO make this a [*:0]const u8 to save memory /// TODO make this a [*:0]const u8 to save memory
bytes: []const u8, bytes: []const u8,
@ -78,6 +80,7 @@ fn formatIdent(
) !void { ) !void {
_ = fmt; _ = fmt;
_ = options; _ = options;
try writer.writeAll("__"); // Add double underscore to avoid conflicting with C's reserved keywords
for (ident) |c, i| { for (ident) |c, i| {
switch (c) { switch (c) {
'a'...'z', 'A'...'Z', '_' => try writer.writeByte(c), 'a'...'z', 'A'...'Z', '_' => try writer.writeByte(c),
@ -741,7 +744,7 @@ pub const DeclGen = struct {
if (!field_ty.hasCodeGenBits()) continue; if (!field_ty.hasCodeGenBits()) continue;
const alignment = entry.value_ptr.abi_align; const alignment = entry.value_ptr.abi_align;
const name: CValue = .{ .bytes = entry.key_ptr.* }; const name: CValue = .{ .identifier = entry.key_ptr.* };
try buffer.append(' '); try buffer.append(' ');
try dg.renderTypeAndName(buffer.writer(), field_ty, name, .Mut, alignment); try dg.renderTypeAndName(buffer.writer(), field_ty, name, .Mut, alignment);
try buffer.appendSlice(";\n"); try buffer.appendSlice(";\n");
@ -1033,6 +1036,7 @@ pub const DeclGen = struct {
try w.writeByte('&'); try w.writeByte('&');
return dg.renderDeclName(decl, w); return dg.renderDeclName(decl, w);
}, },
.identifier => |ident| return w.print("{}", .{fmtIdent(ident)}),
.bytes => |bytes| return w.writeAll(bytes), .bytes => |bytes| return w.writeAll(bytes),
} }
} }