jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-27 23:52:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

translate-c: support referencing c containers in macros

Browse Source
This commit is contained in:
Vexu 2020-12-10 11:33:52 +02:00 committed by Veikka Tuominen
parent 23c1b7faee
commit 73016212a3
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/translate_c.zig
View File

@ -5847,6 +5847,22 @@ fn parseCPrimaryExprInner(c: *Context, m: *MacroCtx, scope: *Scope) ParseError!*
} else {
return transCreateNodeIdentifierUnchecked(c, "c_int");
},
.Keyword_enum, .Keyword_struct, .Keyword_union => {
// struct Foo will be declared as struct_Foo by transRecordDecl
const next_id = m.next().?;
if (next_id != .Identifier) {
try m.fail(c, "unable to translate C expr: expected Identifier instead got: {}", .{@tagName(next_id)});
return error.ParseError;
}
const ident_token = try appendTokenFmt(c, .Identifier, "{}_{}", .{slice, m.slice()});
const identifier = try c.arena.create(ast.Node.OneToken);
identifier.* = .{
.base = .{ .tag = .Identifier },
.token = ident_token,
};
return &identifier.base;
},
.Identifier => {
const mangled_name = scope.getAlias(slice);
return transCreateNodeIdentifier(c, checkForBuiltinTypedef(mangled_name) orelse mangled_name);
@ -5856,7 +5872,7 @@ fn parseCPrimaryExprInner(c: *Context, m: *MacroCtx, scope: *Scope) ParseError!*
const next_id = m.next().?;
if (next_id != .RParen) {
try m.fail(c, "unable to translate C expr: expected ')'' instead got: {}", .{@tagName(next_id)});
try m.fail(c, "unable to translate C expr: expected ')' instead got: {}", .{@tagName(next_id)});
return error.ParseError;
}
var saw_l_paren = false;
@ -5886,7 +5902,7 @@ fn parseCPrimaryExprInner(c: *Context, m: *MacroCtx, scope: *Scope) ParseError!*
const node_to_cast = try parseCExpr(c, m, scope);
if (saw_l_paren and m.next().? != .RParen) {
try m.fail(c, "unable to translate C expr: expected ')''", .{});
try m.fail(c, "unable to translate C expr: expected ')'", .{});
return error.ParseError;
}

6
test/stage1/behavior/translate_c_macros.h
View File

@ -10,3 +10,9 @@ typedef struct Color {
#define MY_SIZEOF(x) ((int)sizeof(x))
#define MY_SIZEOF2(x) ((int)sizeof x)
struct Foo {
int a;
};
#define SIZE_OF_FOO sizeof(struct Foo)

4
test/stage1/behavior/translate_c_macros.zig
View File

@ -16,3 +16,7 @@ test "sizeof in macros" {
expectEqual(@as(c_int, @sizeOf(u32)), h.MY_SIZEOF(u32));
expectEqual(@as(c_int, @sizeOf(u32)), h.MY_SIZEOF2(u32));
}
test "reference to a struct type" {
expectEqual(@sizeOf(h.struct_Foo), h.SIZE_OF_FOO);
}