Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4040 from Vexu/translate-c-cast-fixes

Browse Source 
Translate c cast fixes
This commit is contained in:
Andrew Kelley 2020-01-02 14:57:48 -05:00 committed by GitHub
commit fe21d84c94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src-self-hosted/translate_c.zig
View File

@ -898,11 +898,25 @@ fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.No
try container_node.fields_and_decls.push(&field_node.base); try container_node.fields_and_decls.push(&field_node.base);
_ = try appendToken(c, .Comma, ","); _ = try appendToken(c, .Comma, ",");
// In C each enum value is in the global namespace. So we put them there too. // In C each enum value is in the global namespace. So we put them there too.
// At this point we can rely on the enum emitting successfully. // At this point we can rely on the enum emitting successfully.
const tld_node = try transCreateNodeVarDecl(c, true, true, enum_val_name); const tld_node = try transCreateNodeVarDecl(c, true, true, enum_val_name);
tld_node.eq_token = try appendToken(c, .Equal, "="); tld_node.eq_token = try appendToken(c, .Equal, "=");
tld_node.init_node = try transCreateNodeAPInt(c, ZigClangEnumConstantDecl_getInitVal(enum_const)); const cast_node = try transCreateNodeBuiltinFnCall(rp.c, "@enumToInt");
const enum_ident = try transCreateNodeIdentifier(c, name);
const period_tok = try appendToken(c, .Period, ".");
const field_ident = try transCreateNodeIdentifier(c, field_name);
const field_access_node = try c.a().create(ast.Node.InfixOp);
field_access_node.* = .{
.op_token = period_tok,
.lhs = enum_ident,
.op = .Period,
.rhs = field_ident,
};
try cast_node.params.push(&field_access_node.base);
cast_node.rparen_token = try appendToken(rp.c, .RParen, ")");
tld_node.init_node = &cast_node.base;
tld_node.semicolon_token = try appendToken(c, .Semicolon, ";"); tld_node.semicolon_token = try appendToken(c, .Semicolon, ";");
try addTopLevelDecl(c, field_name, &tld_node.base); try addTopLevelDecl(c, field_name, &tld_node.base);
} }
@ -1712,15 +1726,7 @@ fn transCCast(
builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")"); builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
return &builtin_node.base; return &builtin_node.base;
} }
if (ZigClangQualType_getTypeClass(src_type) == .Elaborated) { if (ZigClangQualType_getTypeClass(ZigClangQualType_getCanonicalType(dst_type)) == .Enum) {
const elaborated_ty = @ptrCast(*const ZigClangElaboratedType, ZigClangQualType_getTypePtr(src_type));
return transCCast(rp, scope, loc, dst_type, ZigClangElaboratedType_getNamedType(elaborated_ty), expr);
}
if (ZigClangQualType_getTypeClass(dst_type) == .Elaborated) {
const elaborated_ty = @ptrCast(*const ZigClangElaboratedType, ZigClangQualType_getTypePtr(dst_type));
return transCCast(rp, scope, loc, ZigClangElaboratedType_getNamedType(elaborated_ty), src_type, expr);
}
if (ZigClangQualType_getTypeClass(dst_type) == .Enum) {
const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@intToEnum"); const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@intToEnum");
try builtin_node.params.push(try transQualType(rp, dst_type, loc)); try builtin_node.params.push(try transQualType(rp, dst_type, loc));
_ = try appendToken(rp.c, .Comma, ","); _ = try appendToken(rp.c, .Comma, ",");
@ -1728,8 +1734,8 @@ fn transCCast(
builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")"); builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
return &builtin_node.base; return &builtin_node.base;
} }
if (ZigClangQualType_getTypeClass(src_type) == .Enum and if (ZigClangQualType_getTypeClass(ZigClangQualType_getCanonicalType(src_type)) == .Enum and
ZigClangQualType_getTypeClass(dst_type) != .Enum) ZigClangQualType_getTypeClass(ZigClangQualType_getCanonicalType(dst_type)) != .Enum)
{ {
const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@enumToInt"); const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@enumToInt");
try builtin_node.params.push(expr); try builtin_node.params.push(expr);

61
test/translate_c.zig
View File

@ -912,7 +912,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
\\extern enum enum_ty my_enum; \\extern enum enum_ty my_enum;
\\enum enum_ty { FOO }; \\enum enum_ty { FOO };
, &[_][]const u8{ , &[_][]const u8{
\\pub const FOO = 0; \\pub const FOO = @enumToInt(enum_enum_ty.FOO);
\\pub const enum_enum_ty = extern enum { \\pub const enum_enum_ty = extern enum {
\\ FOO, \\ FOO,
\\}; \\};
@ -990,27 +990,27 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
\\ p, \\ p,
\\}; \\};
, &[_][]const u8{ , &[_][]const u8{
\\pub const a = 0; \\pub const a = @enumToInt(enum_unnamed_1.a);
\\pub const b = 1; \\pub const b = @enumToInt(enum_unnamed_1.b);
\\pub const c = 2; \\pub const c = @enumToInt(enum_unnamed_1.c);
\\const enum_unnamed_1 = extern enum { \\const enum_unnamed_1 = extern enum {
\\ a, \\ a,
\\ b, \\ b,
\\ c, \\ c,
\\}; \\};
\\pub const d = enum_unnamed_1; \\pub const d = enum_unnamed_1;
\\pub const e = 0; \\pub const e = @enumToInt(enum_unnamed_2.e);
\\pub const f = 4; \\pub const f = @enumToInt(enum_unnamed_2.f);
\\pub const g = 5; \\pub const g = @enumToInt(enum_unnamed_2.g);
\\const enum_unnamed_2 = extern enum { \\const enum_unnamed_2 = extern enum {
\\ e = 0, \\ e = 0,
\\ f = 4, \\ f = 4,
\\ g = 5, \\ g = 5,
\\}; \\};
\\pub export var h: enum_unnamed_2 = @intToEnum(enum_unnamed_2, e); \\pub export var h: enum_unnamed_2 = @intToEnum(enum_unnamed_2, e);
\\pub const i = 0; \\pub const i = @enumToInt(enum_unnamed_3.i);
\\pub const j = 1; \\pub const j = @enumToInt(enum_unnamed_3.j);
\\pub const k = 2; \\pub const k = @enumToInt(enum_unnamed_3.k);
\\const enum_unnamed_3 = extern enum { \\const enum_unnamed_3 = extern enum {
\\ i, \\ i,
\\ j, \\ j,
@ -1020,9 +1020,9 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
\\ l: enum_unnamed_3, \\ l: enum_unnamed_3,
\\ m: d, \\ m: d,
\\}; \\};
\\pub const n = 0; \\pub const n = @enumToInt(enum_i.n);
\\pub const o = 1; \\pub const o = @enumToInt(enum_i.o);
\\pub const p = 2; \\pub const p = @enumToInt(enum_i.p);
\\pub const enum_i = extern enum { \\pub const enum_i = extern enum {
\\ n, \\ n,
\\ o, \\ o,
@ -1448,8 +1448,8 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
\\ Two, \\ Two,
\\}; \\};
, &[_][]const u8{ , &[_][]const u8{
\\pub const One = 0; \\pub const One = @enumToInt(enum_unnamed_1.One);
\\pub const Two = 1; \\pub const Two = @enumToInt(enum_unnamed_1.Two);
\\const enum_unnamed_1 = extern enum { \\const enum_unnamed_1 = extern enum {
\\ One, \\ One,
\\ Two, \\ Two,
@ -2252,28 +2252,6 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
\\pub const FOO_CHAR = '\x3f'; \\pub const FOO_CHAR = '\x3f';
}); });
cases.add("enums",
\\enum Foo {
\\ FooA,
\\ FooB,
\\ Foo1,
\\};
, &[_][]const u8{
\\pub const enum_Foo = extern enum {
\\ A,
\\ B,
\\ @"1",
\\};
,
\\pub const FooA = 0;
,
\\pub const FooB = 1;
,
\\pub const Foo1 = 2;
,
\\pub const Foo = enum_Foo;
});
cases.add("enums", cases.add("enums",
\\enum Foo { \\enum Foo {
\\ FooA = 2, \\ FooA = 2,
@ -2281,17 +2259,14 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
\\ Foo1, \\ Foo1,
\\}; \\};
, &[_][]const u8{ , &[_][]const u8{
\\pub const FooA = @enumToInt(enum_Foo.A);
\\pub const FooB = @enumToInt(enum_Foo.B);
\\pub const Foo1 = @enumToInt(enum_Foo.@"1");
\\pub const enum_Foo = extern enum { \\pub const enum_Foo = extern enum {
\\ A = 2, \\ A = 2,
\\ B = 5, \\ B = 5,
\\ @"1" = 6, \\ @"1" = 6,
\\}; \\};
,
\\pub const FooA = 2;
,
\\pub const FooB = 5;
,
\\pub const Foo1 = 6;
, ,
\\pub const Foo = enum_Foo; \\pub const Foo = enum_Foo;
}); });