authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-05-13 17:53:15+03:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-05-13 17:53:15+03:00
logafab095b6115e189ea2c5e0947a21e55a82c9f99
tree84bc454d14021b59f15596b4e3dbc22efda59126
parentcefc04348e79f85118ad3c7b7fd15a4a5d635d50
signature Commit is signed but in an unrecognized format.

translate-c remove error set from `checkForBuiltinTypedef`

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

src-self-hosted/translate_c.zig+3-3
...@@ -668,7 +668,7 @@ fn transTypeDefAsBuiltin(c: *Context, typedef_decl: *const ZigClangTypedefNameDe...@@ -668,7 +668,7 @@ fn transTypeDefAsBuiltin(c: *Context, typedef_decl: *const ZigClangTypedefNameDe
668 return transCreateNodeIdentifier(c, builtin_name);668 return transCreateNodeIdentifier(c, builtin_name);
669}669}
670670
671fn checkForBuiltinTypedef(checked_name: []const u8) !?[]const u8 {671fn checkForBuiltinTypedef(checked_name: []const u8) ?[]const u8 {
672 const table = [_][2][]const u8{672 const table = [_][2][]const u8{
673 .{ "uint8_t", "u8" },673 .{ "uint8_t", "u8" },
674 .{ "int8_t", "i8" },674 .{ "int8_t", "i8" },
...@@ -703,7 +703,7 @@ fn transTypeDef(c: *Context, typedef_decl: *const ZigClangTypedefNameDecl, top_l...@@ -703,7 +703,7 @@ fn transTypeDef(c: *Context, typedef_decl: *const ZigClangTypedefNameDecl, top_l
703 // TODO https://github.com/ziglang/zig/issues/3756703 // TODO https://github.com/ziglang/zig/issues/3756
704 // TODO https://github.com/ziglang/zig/issues/1802704 // TODO https://github.com/ziglang/zig/issues/1802
705 const checked_name = if (isZigPrimitiveType(typedef_name)) try std.fmt.allocPrint(c.a(), "{}_{}", .{ typedef_name, c.getMangle() }) else typedef_name;705 const checked_name = if (isZigPrimitiveType(typedef_name)) try std.fmt.allocPrint(c.a(), "{}_{}", .{ typedef_name, c.getMangle() }) else typedef_name;
706 if (try checkForBuiltinTypedef(checked_name)) |builtin| {706 if (checkForBuiltinTypedef(checked_name)) |builtin| {
707 return transTypeDefAsBuiltin(c, typedef_decl, builtin);707 return transTypeDefAsBuiltin(c, typedef_decl, builtin);
708 }708 }
709709
...@@ -1411,7 +1411,7 @@ fn transDeclStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangDeclStmt)...@@ -1411,7 +1411,7 @@ fn transDeclStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangDeclStmt)
1411 const underlying_type = ZigClangQualType_getTypePtr(underlying_qual);1411 const underlying_type = ZigClangQualType_getTypePtr(underlying_qual);
14121412
1413 const mangled_name = try block_scope.makeMangledName(c, name);1413 const mangled_name = try block_scope.makeMangledName(c, name);
1414 if (try checkForBuiltinTypedef(name)) |builtin| {1414 if (checkForBuiltinTypedef(name)) |builtin| {
1415 try block_scope.variables.push(.{1415 try block_scope.variables.push(.{
1416 .alias = builtin,1416 .alias = builtin,
1417 .name = mangled_name,1417 .name = mangled_name,