authorgravatar for mail@isaacfreund.comIsaac Freund <mail@isaacfreund.com> 2021-05-27 21:08:54+00:00
committergravatar for mail@isaacfreund.comIsaac Freund <mail@isaacfreund.com> 2021-05-31 19:51:11+00:00
log608bc1cbd5910ee796cc292b43db77547858bf98
treef4fdcf061ee03ee6212f6cd373d812b463085760
parent322215bf0afb32335dc75622632d411369a11e0a
signaturelock-open Commit is signed but in an unrecognized format.

stage2: disallow `1.e9` and `0x1.p9` as float literals

Instead require `1e9` and `0x1p9`, disallowing the trailing dot. This change to the grammar is consistent with forbidding `1.` and `0x1.` as float literals and ensures there is only one way to do things here.

9 files changed, 32 insertions(+), 28 deletions(-)

lib/std/fmt.zig+9-6
......@@ -1121,9 +1121,12 @@ pub fn formatFloatHexadecimal(
11211121
11221122 try writer.writeAll("0x");
11231123 try writer.writeByte(buf[0]);
1124 if (options.precision != @as(usize, 0))
1125 try writer.writeAll(".");
11261124 const trimmed = mem.trimRight(u8, buf[1..], "0");
1125 if (options.precision) |precision| {
1126 if (precision > 0) try writer.writeAll(".");
1127 } else if (trimmed.len > 0) {
1128 try writer.writeAll(".");
1129 }
11271130 try writer.writeAll(trimmed);
11281131 // Add trailing zeros if explicitly requested.
11291132 if (options.precision) |precision| if (precision > 0) {
......@@ -2048,10 +2051,10 @@ test "float.hexadecimal" {
20482051 try expectFmt("f64: 0x1.5555555555555p-2", "f64: {x}", .{@as(f64, 1.0 / 3.0)});
20492052 try expectFmt("f128: 0x1.5555555555555555555555555555p-2", "f128: {x}", .{@as(f128, 1.0 / 3.0)});
20502053
2051 try expectFmt("f16: 0x1.p-14", "f16: {x}", .{@as(f16, math.f16_min)});
2052 try expectFmt("f32: 0x1.p-126", "f32: {x}", .{@as(f32, math.f32_min)});
2053 try expectFmt("f64: 0x1.p-1022", "f64: {x}", .{@as(f64, math.f64_min)});
2054 try expectFmt("f128: 0x1.p-16382", "f128: {x}", .{@as(f128, math.f128_min)});
2054 try expectFmt("f16: 0x1p-14", "f16: {x}", .{@as(f16, math.f16_min)});
2055 try expectFmt("f32: 0x1p-126", "f32: {x}", .{@as(f32, math.f32_min)});
2056 try expectFmt("f64: 0x1p-1022", "f64: {x}", .{@as(f64, math.f64_min)});
2057 try expectFmt("f128: 0x1p-16382", "f128: {x}", .{@as(f128, math.f128_min)});
20552058
20562059 try expectFmt("f16: 0x0.004p-14", "f16: {x}", .{@as(f16, math.f16_true_min)});
20572060 try expectFmt("f32: 0x0.000002p-126", "f32: {x}", .{@as(f32, math.f32_true_min)});
lib/std/special/compiler_rt/fixunstfdi_test.zig+1-1
......@@ -46,7 +46,7 @@ test "fixunstfdi" {
4646 try test__fixunstfdi(0x1.0000000000000000p+63, 0x8000000000000000);
4747 try test__fixunstfdi(0x1.FFFFFFFFFFFFFFFCp+62, 0x7FFFFFFFFFFFFFFF);
4848 try test__fixunstfdi(0x1.FFFFFFFFFFFFFFF8p+62, 0x7FFFFFFFFFFFFFFE);
49 try test__fixunstfdi(0x1.p+64, 0xFFFFFFFFFFFFFFFF);
49 try test__fixunstfdi(0x1p+64, 0xFFFFFFFFFFFFFFFF);
5050
5151 try test__fixunstfdi(-0x1.0000000000000000p+63, 0);
5252 try test__fixunstfdi(-0x1.FFFFFFFFFFFFFFFCp+62, 0);
lib/std/special/compiler_rt/fixunstfsi_test.zig+1-1
......@@ -23,5 +23,5 @@ test "fixunstfsi" {
2323 try test__fixunstfsi(0x1.23456789abcdefp+256, 0xffffffff);
2424 try test__fixunstfsi(-0x1.23456789abcdefp+3, 0x0);
2525
26 try test__fixunstfsi(0x1.p+32, 0xFFFFFFFF);
26 try test__fixunstfsi(0x1p+32, 0xFFFFFFFF);
2727}
lib/std/special/compiler_rt/fixunstfti_test.zig+1-1
......@@ -28,7 +28,7 @@ test "fixunstfti" {
2828 try test__fixunstfti(-0.01, 0);
2929 try test__fixunstfti(-0.99, 0);
3030
31 try test__fixunstfti(0x1.p+128, 0xffffffffffffffffffffffffffffffff);
31 try test__fixunstfti(0x1p+128, 0xffffffffffffffffffffffffffffffff);
3232
3333 try test__fixunstfti(0x1.FFFFFEp+126, 0x7fffff80000000000000000000000000);
3434 try test__fixunstfti(0x1.FFFFFEp+127, 0xffffff00000000000000000000000000);
lib/std/special/compiler_rt/mulXf3_test.zig+2-2
......@@ -92,12 +92,12 @@ test "multf3" {
9292 // Denormal operands.
9393 try test__multf3(
9494 0x0.0000000000000000000000000001p-16382,
95 0x1.p16383,
95 0x1p16383,
9696 0x3f90000000000000,
9797 0x0,
9898 );
9999 try test__multf3(
100 0x1.p16383,
100 0x1p16383,
101101 0x0.0000000000000000000000000001p-16382,
102102 0x3f90000000000000,
103103 0x0,
lib/std/zig/parser_test.zig+4-4
......@@ -4152,13 +4152,13 @@ test "zig fmt: hex literals with underscore separators" {
41524152test "zig fmt: decimal float literals with underscore separators" {
41534153 try testTransform(
41544154 \\pub fn main() void {
4155 \\ const a:f64=(10.0e-0+(10.e+0))+10_00.00_00e-2+00_00.00_10e+4;
4155 \\ const a:f64=(10.0e-0+(10.0e+0))+10_00.00_00e-2+00_00.00_10e+4;
41564156 \\ const b:f64=010.0--0_10.0+0_1_0.0_0+1e2;
41574157 \\ std.debug.warn("a: {}, b: {} -> a+b: {}\n", .{ a, b, a + b });
41584158 \\}
41594159 ,
41604160 \\pub fn main() void {
4161 \\ const a: f64 = (10.0e-0 + (10.e+0)) + 10_00.00_00e-2 + 00_00.00_10e+4;
4161 \\ const a: f64 = (10.0e-0 + (10.0e+0)) + 10_00.00_00e-2 + 00_00.00_10e+4;
41624162 \\ const b: f64 = 010.0 - -0_10.0 + 0_1_0.0_0 + 1e2;
41634163 \\ std.debug.warn("a: {}, b: {} -> a+b: {}\n", .{ a, b, a + b });
41644164 \\}
......@@ -4169,13 +4169,13 @@ test "zig fmt: decimal float literals with underscore separators" {
41694169test "zig fmt: hexadeciaml float literals with underscore separators" {
41704170 try testTransform(
41714171 \\pub fn main() void {
4172 \\ const a: f64 = (0x10.0p-0+(0x10.p+0))+0x10_00.00_00p-8+0x00_00.00_10p+16;
4172 \\ const a: f64 = (0x10.0p-0+(0x10.0p+0))+0x10_00.00_00p-8+0x00_00.00_10p+16;
41734173 \\ const b: f64 = 0x0010.0--0x00_10.0+0x10.00+0x1p4;
41744174 \\ std.debug.warn("a: {}, b: {} -> a+b: {}\n", .{ a, b, a + b });
41754175 \\}
41764176 ,
41774177 \\pub fn main() void {
4178 \\ const a: f64 = (0x10.0p-0 + (0x10.p+0)) + 0x10_00.00_00p-8 + 0x00_00.00_10p+16;
4178 \\ const a: f64 = (0x10.0p-0 + (0x10.0p+0)) + 0x10_00.00_00p-8 + 0x00_00.00_10p+16;
41794179 \\ const b: f64 = 0x0010.0 - -0x00_10.0 + 0x10.00 + 0x1p4;
41804180 \\ std.debug.warn("a: {}, b: {} -> a+b: {}\n", .{ a, b, a + b });
41814181 \\}
lib/std/zig/tokenizer.zig+3-11
......@@ -1210,10 +1210,6 @@ pub const Tokenizer = struct {
12101210 state = .start;
12111211 break;
12121212 },
1213 'e', 'E' => {
1214 result.tag = .float_literal;
1215 state = .float_exponent_unsigned;
1216 },
12171213 '0'...'9' => {
12181214 result.tag = .float_literal;
12191215 state = .float_fraction_dec;
......@@ -1232,10 +1228,6 @@ pub const Tokenizer = struct {
12321228 state = .start;
12331229 break;
12341230 },
1235 'p', 'P' => {
1236 result.tag = .float_literal;
1237 state = .float_exponent_unsigned;
1238 },
12391231 '0'...'9', 'a'...'f', 'A'...'F' => {
12401232 result.tag = .float_literal;
12411233 state = .float_fraction_hex;
......@@ -1861,7 +1853,6 @@ test "tokenizer - number literals decimal" {
18611853 try testTokenize("0e0", &.{.float_literal});
18621854 try testTokenize("1e0", &.{.float_literal});
18631855 try testTokenize("1e100", &.{.float_literal});
1864 try testTokenize("1.e100", &.{.float_literal});
18651856 try testTokenize("1.0e100", &.{.float_literal});
18661857 try testTokenize("1.0e+100", &.{.float_literal});
18671858 try testTokenize("1.0e-100", &.{.float_literal});
......@@ -1869,6 +1860,7 @@ test "tokenizer - number literals decimal" {
18691860
18701861 try testTokenize("1.", &.{.invalid});
18711862 try testTokenize("1e", &.{.invalid});
1863 try testTokenize("1.e100", &.{ .invalid, .identifier });
18721864 try testTokenize("1.0e1f0", &.{ .invalid, .identifier });
18731865 try testTokenize("1.0p100", &.{ .invalid, .identifier });
18741866 try testTokenize("1.0p-100", &.{ .invalid, .identifier, .minus, .integer_literal });
......@@ -2019,6 +2011,7 @@ test "tokenizer - number literals hexadecimal" {
20192011 try testTokenize("0x1.", &.{.invalid});
20202012 try testTokenize("0xF.", &.{.invalid});
20212013 try testTokenize("0x1.+0xF.", &.{ .invalid, .plus, .invalid });
2014 try testTokenize("0xff.p10", &.{ .invalid, .identifier });
20222015
20232016 try testTokenize("0x0123456.789ABCDEF", &.{.float_literal});
20242017 try testTokenize("0x0_123_456.789_ABC_DEF", &.{.float_literal});
......@@ -2027,7 +2020,6 @@ test "tokenizer - number literals hexadecimal" {
20272020 try testTokenize("0x0.0p0", &.{.float_literal});
20282021 try testTokenize("0xff.ffp10", &.{.float_literal});
20292022 try testTokenize("0xff.ffP10", &.{.float_literal});
2030 try testTokenize("0xff.p10", &.{.float_literal});
20312023 try testTokenize("0xffp10", &.{.float_literal});
20322024 try testTokenize("0xff_ff.ff_ffp1_0_0_0", &.{.float_literal});
20332025 try testTokenize("0xf_f_f_f.f_f_f_fp+1_000", &.{.float_literal});
......@@ -2038,7 +2030,7 @@ test "tokenizer - number literals hexadecimal" {
20382030 try testTokenize("0x1p", &.{.invalid});
20392031 try testTokenize("0xfp0z1", &.{ .invalid, .identifier });
20402032 try testTokenize("0xff.ffpff", &.{ .invalid, .identifier });
2041 try testTokenize("0x0.p", &.{.invalid});
2033 try testTokenize("0x0.p", &.{ .invalid, .identifier });
20422034 try testTokenize("0x0.z", &.{ .invalid, .identifier });
20432035 try testTokenize("0x0._", &.{ .invalid, .identifier });
20442036 try testTokenize("0x0_.0", &.{ .invalid, .period, .integer_literal });
src/translate_c.zig+10-1
......@@ -4932,8 +4932,17 @@ fn parseCNumLit(c: *Context, m: *MacroCtx) ParseError!Node {
49324932 }
49334933 },
49344934 .FloatLiteral => |suffix| {
4935 if (lit_bytes[0] == '.')
4935 const dot_index = mem.indexOfScalar(u8, lit_bytes, '.').?;
4936 if (dot_index == 0) {
49364937 lit_bytes = try std.fmt.allocPrint(c.arena, "0{s}", .{lit_bytes});
4938 } else if (dot_index + 1 == lit_bytes.len or !std.ascii.isDigit(lit_bytes[dot_index + 1])) {
4939 // If the literal lacks a digit after the `.`, we need to
4940 // add one since `1.` or `1.e10` would be invalid syntax in Zig.
4941 lit_bytes = try std.fmt.allocPrint(c.arena, "{s}0{s}", .{
4942 lit_bytes[0 .. dot_index + 1],
4943 lit_bytes[dot_index + 1 ..],
4944 });
4945 }
49374946 if (suffix == .none) {
49384947 return transCreateNodeNumber(c, lit_bytes, .float);
49394948 }
test/translate_c.zig+1-1
......@@ -1110,7 +1110,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
11101110 \\#define BAR .12345
11111111 , &[_][]const u8{
11121112 "pub const foo = @as(f32, 3.14);",
1113 "pub const bar = @as(c_longdouble, 16.e-2);",
1113 "pub const bar = @as(c_longdouble, 16.0e-2);",
11141114 "pub const FOO = 0.12345;",
11151115 "pub const BAR = 0.12345;",
11161116 });