authorgravatar for evan@lagerdata.comEvan Haas <evan@lagerdata.com> 2021-06-23 11:28:41-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-23 14:51:19-04:00
log29314b64bd91be91e8f1d48a1b71eba68569be94
treed715ce49093cad93f00dff554b47b3b64a58fdc3
parent32595320807fdb8a175674621b0b2216527f9d4f

translate-c: ensure scoped (non-public) enum constants are used

1 files changed, 4 insertions(+), 1 deletions(-)

src/translate_c.zig+4-1
...@@ -1137,8 +1137,10 @@ fn transEnumDecl(c: *Context, scope: *Scope, enum_decl: *const clang.EnumDecl) E...@@ -1137,8 +1137,10 @@ fn transEnumDecl(c: *Context, scope: *Scope, enum_decl: *const clang.EnumDecl) E
1137 });1137 });
1138 if (toplevel)1138 if (toplevel)
1139 try addTopLevelDecl(c, enum_val_name, enum_const_def)1139 try addTopLevelDecl(c, enum_val_name, enum_const_def)
1140 else1140 else {
1141 try scope.appendNode(enum_const_def);1141 try scope.appendNode(enum_const_def);
1142 try bs.discardVariable(c, enum_val_name);
1143 }
1142 }1144 }
11431145
1144 const int_type = enum_decl.getIntegerType();1146 const int_type = enum_decl.getIntegerType();
...@@ -1177,6 +1179,7 @@ fn transEnumDecl(c: *Context, scope: *Scope, enum_decl: *const clang.EnumDecl) E...@@ -1177,6 +1179,7 @@ fn transEnumDecl(c: *Context, scope: *Scope, enum_decl: *const clang.EnumDecl) E
1177 try c.alias_list.append(.{ .alias = bare_name, .name = name });1179 try c.alias_list.append(.{ .alias = bare_name, .name = name });
1178 } else {1180 } else {
1179 try scope.appendNode(Node.initPayload(&payload.base));1181 try scope.appendNode(Node.initPayload(&payload.base));
1182 try bs.discardVariable(c, name);
1180 }1183 }
1181}1184}
11821185