mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 22:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5032 from LakeByTheWoods/redo_translate_c

Browse Source 
Translate C: Redo Add comment containing c source location for failed decls.
This commit is contained in:
Vexu 2020-05-16 17:37:19 +03:00 committed by GitHub
commit 74f7d710bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/std/zig/render.zig
View File

@ -2332,8 +2332,10 @@ fn renderTokenOffset(
}
while (true) {
assert(loc.line != 0);
const newline_count = if (loc.line == 1) @as(u8, 1) else @as(u8, 2);
// translate-c doesn't generate correct newlines
// in generated code (loc.line == 0) so treat that case
// as though there was meant to be a newline between the tokens
const newline_count = if (loc.line <= 1) @as(u8, 1) else @as(u8, 2);
try stream.writeByteNTimes('\n', newline_count);
try stream.writeByteNTimes(' ', indent);
try stream.writeAll(mem.trimRight(u8, tree.tokenSlicePtr(next_token), " "));

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

@ -3103,6 +3103,7 @@ fn transCreateCompoundAssign(
// common case
// c: lhs += rhs
// zig: lhs += rhs
if ((is_mod or is_div) and is_signed) {
const op_token = try appendToken(rp.c, .Equal, "=");
const op_node = try rp.c.a().create(ast.Node.InfixOp);
@ -4813,6 +4814,7 @@ pub fn failDecl(c: *Context, loc: ZigClangSourceLocation, name: []const u8, comp
const msg_tok = try appendTokenFmt(c, .StringLiteral, "\"" ++ format ++ "\"", args);
const rparen_tok = try appendToken(c, .RParen, ")");
const semi_tok = try appendToken(c, .Semicolon, ";");
_ = try appendTokenFmt(c, .LineComment, "// {}", .{c.locStr(loc)});
const msg_node = try c.a().create(ast.Node.StringLiteral);
msg_node.* = .{
@ -5049,8 +5051,8 @@ fn transMacroDefine(c: *Context, it: *CTokenList.Iterator, source: []const u8, n
c,
source_loc,
name,
"unable to translate C expr: unexpected token {}",
.{last.id},
"unable to translate C expr: unexpected token .{}",
.{@tagName(last.id)},
);
node.semicolon_token = try appendToken(c, .Semicolon, ";");
@ -5157,8 +5159,8 @@ fn transMacroFnDefine(c: *Context, it: *CTokenList.Iterator, source: []const u8,
c,
source_loc,
name,
"unable to translate C expr: unexpected token {}",
.{last.id},
"unable to translate C expr: unexpected token .{}",
.{@tagName(last.id)},
);
_ = try appendToken(c, .Semicolon, ";");
const type_of_arg = if (expr.id != .Block) expr else blk: {
@ -5476,7 +5478,7 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
};
return &node.base;
} else {
const token = try appendTokenFmt(c, .IntegerLiteral, "0x{x}", .{source[tok.start + 1 .. tok.end - 1]});
const token = try appendTokenFmt(c, .IntegerLiteral, "0x{x}", .{source[tok.start+1..tok.end-1]});
const node = try c.a().create(ast.Node.IntegerLiteral);
node.* = .{
.token = token,
@ -5726,8 +5728,8 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
c,
source_loc,
source[first_tok.start..first_tok.end],
"unable to translate C expr: unexpected token {}",
.{tok.id},
"unable to translate C expr: unexpected token .{}",
.{@tagName(tok.id)},
);
return error.ParseError;
},