mirror of
https://github.com/ziglang/zig.git
synced 2026-02-14 21:38:33 +00:00
translate-c-2 final small fixes
This commit is contained in:
Vexu
parent
e0046b737e
commit
9437d99ae2
@ -79,8 +79,6 @@ fn zigifyEscapeSequences(allocator: *std.mem.Allocator, tok: CToken) !CToken {
|
||||
Escape,
|
||||
Hex,
|
||||
Octal,
|
||||
HexZero,
|
||||
OctalZero,
|
||||
} = .Start;
|
||||
var i: usize = 0;
|
||||
var count: u8 = 0;
|
||||
@ -92,20 +90,15 @@ fn zigifyEscapeSequences(allocator: *std.mem.Allocator, tok: CToken) !CToken {
|
||||
'n', 'r', 't', '\\', '\'', '\"' => {
|
||||
bytes[i] = c;
|
||||
},
|
||||
'0' => {
|
||||
state = .OctalZero;
|
||||
bytes[i] = 'x';
|
||||
},
|
||||
'1'...'7' => {
|
||||
'0'...'7' => {
|
||||
count += 1;
|
||||
num *= 8;
|
||||
num += c - '0';
|
||||
state = .Octal;
|
||||
bytes[i] = 'x';
|
||||
},
|
||||
'x' => {
|
||||
state = .HexZero;
|
||||
bytes[i] = c;
|
||||
state = .Hex;
|
||||
bytes[i] = 'x';
|
||||
},
|
||||
'a' => {
|
||||
bytes[i] = 'x';
|
||||
@ -159,83 +152,37 @@ fn zigifyEscapeSequences(allocator: *std.mem.Allocator, tok: CToken) !CToken {
|
||||
bytes[i] = c;
|
||||
i += 1;
|
||||
},
|
||||
.HexZero => {
|
||||
switch (c) {
|
||||
'0' => { continue; },
|
||||
'1'...'9' => {
|
||||
count += 1;
|
||||
num *= 16;
|
||||
num += c - '0';
|
||||
},
|
||||
'a'...'f' => {
|
||||
count += 1;
|
||||
num *= 16;
|
||||
num += c - 'a' + 10;
|
||||
},
|
||||
'A'...'F' => {
|
||||
count += 1;
|
||||
num *= 16;
|
||||
num += c - 'A' + 10;
|
||||
},
|
||||
else => {},
|
||||
}
|
||||
state = .Hex;
|
||||
},
|
||||
.Hex => {
|
||||
switch (c) {
|
||||
'0'...'9' => {
|
||||
count += 1;
|
||||
num *= 16;
|
||||
num = std.math.mul(u8, num, 16) catch return error.TokenizingFailed;
|
||||
num += c - '0';
|
||||
if (count < 2)
|
||||
continue;
|
||||
},
|
||||
'a'...'f' => {
|
||||
count += 1;
|
||||
num *= 16;
|
||||
num = std.math.mul(u8, num, 16) catch return error.TokenizingFailed;
|
||||
num += c - 'a' + 10;
|
||||
if (count < 2)
|
||||
continue;
|
||||
},
|
||||
'A'...'F' => {
|
||||
count += 1;
|
||||
num *= 16;
|
||||
num = std.math.mul(u8, num, 16) catch return error.TokenizingFailed;
|
||||
num += c - 'A' + 10;
|
||||
if (count < 2)
|
||||
continue;
|
||||
},
|
||||
else => {},
|
||||
}
|
||||
i += std.fmt.formatIntBuf(bytes[i..], num, 16, false, std.fmt.FormatOptions{.fill = '0', .width = 2});
|
||||
switch (c) {
|
||||
'\\' => state = .Escape,
|
||||
'0'...'9', 'a'...'f','A'...'F' => state = .Start,
|
||||
else => {
|
||||
state = .Start;
|
||||
i += std.fmt.formatIntBuf(bytes[i..], num, 16, false, std.fmt.FormatOptions{.fill = '0', .width = 2});
|
||||
num = 0;
|
||||
if (c == '\\')
|
||||
state = .Escape
|
||||
else
|
||||
state = .Start;
|
||||
bytes[i] = c;
|
||||
i += 1;
|
||||
},
|
||||
}
|
||||
count = 0;
|
||||
num = 0;
|
||||
},
|
||||
.OctalZero => {
|
||||
switch (c) {
|
||||
'0' => { continue; },
|
||||
'1'...'7' => {
|
||||
count += 1;
|
||||
num *= 8;
|
||||
num += c - '0';
|
||||
},
|
||||
else => {},
|
||||
}
|
||||
state = .Octal;
|
||||
},
|
||||
.Octal => {
|
||||
switch (c) {
|
||||
'0'...'7' => {
|
||||
count += 1;
|
||||
num *= 8;
|
||||
num = std.math.mul(u8, num, 8) catch return error.TokenizingFailed;
|
||||
num += c - '0';
|
||||
if (count < 3)
|
||||
continue;
|
||||
@ -243,15 +190,7 @@ fn zigifyEscapeSequences(allocator: *std.mem.Allocator, tok: CToken) !CToken {
|
||||
else => {},
|
||||
}
|
||||
i += std.fmt.formatIntBuf(bytes[i..], num, 16, false, std.fmt.FormatOptions{.fill = '0', .width = 2});
|
||||
switch (c) {
|
||||
'\\' => state = .Escape,
|
||||
'0'...'7' => state = .Start,
|
||||
else => {
|
||||
state = .Start;
|
||||
bytes[i] = c;
|
||||
i += 1;
|
||||
},
|
||||
}
|
||||
state = .Start;
|
||||
count = 0;
|
||||
num = 0;
|
||||
},
|
||||
@ -799,12 +738,12 @@ test "escape sequences" {
|
||||
})).bytes, "\\x77"));
|
||||
expect(std.mem.eql(u8, (try zigifyEscapeSequences(a, .{
|
||||
.id = .StrLit,
|
||||
.bytes = "\\00245",
|
||||
})).bytes, "\\xa5"));
|
||||
.bytes = "\\24500",
|
||||
})).bytes, "\\xa500"));
|
||||
expect(std.mem.eql(u8, (try zigifyEscapeSequences(a, .{
|
||||
.id = .StrLit,
|
||||
.bytes = "\\x0077abc",
|
||||
})).bytes, "\\x77abc"));
|
||||
.bytes = "\\x0077 abc",
|
||||
})).bytes, "\\x77 abc"));
|
||||
expect(std.mem.eql(u8, (try zigifyEscapeSequences(a, .{
|
||||
.id = .StrLit,
|
||||
.bytes = "\\045abc",
|
||||
|
||||
@ -340,11 +340,10 @@ fn declVisitor(c: *Context, decl: *const ZigClangDecl) Error!void {
|
||||
}
|
||||
|
||||
fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
|
||||
if (c.decl_table.contains(@ptrToInt(ZigClangFunctionDecl_getCanonicalDecl(fn_decl))))
|
||||
const fn_name = try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, fn_decl)));
|
||||
if (c.global_scope.sym_table.contains(fn_name))
|
||||
return; // Avoid processing this decl twice
|
||||
const rp = makeRestorePoint(c);
|
||||
const fn_name = try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, fn_decl)));
|
||||
_ = try c.decl_table.put(@ptrToInt(fn_decl), fn_name);
|
||||
const fn_decl_loc = ZigClangFunctionDecl_getLocation(fn_decl);
|
||||
const has_body = ZigClangFunctionDecl_hasBody(fn_decl);
|
||||
const storage_class = ZigClangFunctionDecl_getStorageClass(fn_decl);
|
||||
@ -436,7 +435,8 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
|
||||
}
|
||||
|
||||
fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
|
||||
if (c.decl_table.contains(@ptrToInt(ZigClangVarDecl_getCanonicalDecl(var_decl))))
|
||||
const var_name = try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, var_decl)));
|
||||
if (c.global_scope.sym_table.contains(var_name))
|
||||
return; // Avoid processing this decl twice
|
||||
const rp = makeRestorePoint(c);
|
||||
const visib_tok = try appendToken(c, .Keyword_pub, "pub");
|
||||
@ -447,12 +447,10 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
|
||||
try appendToken(c, .Keyword_threadlocal, "threadlocal");
|
||||
|
||||
const scope = &c.global_scope.base;
|
||||
const var_name = try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, var_decl)));
|
||||
|
||||
// TODO https://github.com/ziglang/zig/issues/3756
|
||||
// TODO https://github.com/ziglang/zig/issues/1802
|
||||
const checked_name = if (isZigPrimitiveType(var_name)) try std.fmt.allocPrint(c.a(), "_{}", .{var_name}) else var_name;
|
||||
_ = try c.decl_table.put(@ptrToInt(var_decl), checked_name);
|
||||
const var_decl_loc = ZigClangVarDecl_getLocation(var_decl);
|
||||
|
||||
const qual_type = ZigClangVarDecl_getTypeSourceInfo_getType(var_decl);
|
||||
|
||||
@ -2167,7 +2167,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
|
||||
, &[_][]const u8{
|
||||
\\pub const FOO = "aoeu\x13 derp";
|
||||
,
|
||||
\\pub const FOO2 = "aoeu\x9c derp";
|
||||
\\pub const FOO2 = "aoeu\x134 derp";
|
||||
,
|
||||
\\pub const FOO_CHAR = '\x3f';
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user