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

translate-c: Fix macro define of float constant using scientific notation

Browse Source 
Fixes compiler attempting to use null value when translating macro define of float constant using scientific notation with no decimal point
This commit is contained in:
riverbl 2022-01-12 11:07:12 +00:00 committed by Andrew Kelley
parent a5ac138ae2
commit c4681b4889
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/translate_c.zig
View File

@ -5602,16 +5602,18 @@ fn parseCNumLit(c: *Context, m: *MacroCtx) ParseError!Node {
}, },
.FloatLiteral => |suffix| { .FloatLiteral => |suffix| {
if (suffix != .none) lit_bytes = lit_bytes[0 .. lit_bytes.len - 1]; if (suffix != .none) lit_bytes = lit_bytes[0 .. lit_bytes.len - 1];
const dot_index = mem.indexOfScalar(u8, lit_bytes, '.').?;
if (dot_index == 0) { if (mem.indexOfScalar(u8, lit_bytes, '.')) |dot_index| {
lit_bytes = try std.fmt.allocPrint(c.arena, "0{s}", .{lit_bytes}); if (dot_index == 0) {
} else if (dot_index + 1 == lit_bytes.len or !std.ascii.isDigit(lit_bytes[dot_index + 1])) { lit_bytes = try std.fmt.allocPrint(c.arena, "0{s}", .{lit_bytes});
// If the literal lacks a digit after the `.`, we need to } else if (dot_index + 1 == lit_bytes.len or !std.ascii.isDigit(lit_bytes[dot_index + 1])) {
// add one since `1.` or `1.e10` would be invalid syntax in Zig. // If the literal lacks a digit after the `.`, we need to
lit_bytes = try std.fmt.allocPrint(c.arena, "{s}0{s}", .{ // add one since `1.` or `1.e10` would be invalid syntax in Zig.
lit_bytes[0 .. dot_index + 1], lit_bytes = try std.fmt.allocPrint(c.arena, "{s}0{s}", .{
lit_bytes[dot_index + 1 ..], lit_bytes[0 .. dot_index + 1],
}); lit_bytes[dot_index + 1 ..],
});
}
} }
if (suffix == .none) if (suffix == .none)

4
test/translate_c.zig
View File

@ -1135,11 +1135,15 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
\\#define bar 16.e-2l \\#define bar 16.e-2l
\\#define FOO 0.12345 \\#define FOO 0.12345
\\#define BAR .12345 \\#define BAR .12345
\\#define baz 1e1
\\#define BAZ 42e-3f
, &[_][]const u8{ , &[_][]const u8{
"pub const foo = @as(f32, 3.14);", "pub const foo = @as(f32, 3.14);",
"pub const bar = @as(c_longdouble, 16.0e-2);", "pub const bar = @as(c_longdouble, 16.0e-2);",
"pub const FOO = 0.12345;", "pub const FOO = 0.12345;",
"pub const BAR = 0.12345;", "pub const BAR = 0.12345;",
"pub const baz = 1e1;",
"pub const BAZ = @as(f32, 42e-3);",
}); });
cases.add("comments", cases.add("comments",