diff options
| author | Lewis Gaul <lewis.gaul@gmail.com> | 2023-08-18 07:07:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-18 02:07:49 -0400 |
| commit | 387b0ac4f1c54cb2f83792299aa628a316e17d88 (patch) | |
| tree | 6b69315671946343c6171fe8cf3be451906b3d67 /lib/std/math.zig | |
| parent | 7ef1eb1c27754cb0349fdc10db1f02ff2dddd99b (diff) | |
| download | zig-387b0ac4f1c54cb2f83792299aa628a316e17d88.tar.gz zig-387b0ac4f1c54cb2f83792299aa628a316e17d88.zip | |
Make NaNs quiet by default and other NaN tidy-up (#16826)
* Generalise NaN handling and make std.math.nan() give quiet NaNs
* Address uses of std.math.qnan_* and std.math.nan_* consts
* Comment out failing test due to issues with signalling NaN
* Fix issue in c_builtins.zig where we need qnan_u32
Diffstat (limited to 'lib/std/math.zig')
| -rw-r--r-- | lib/std/math.zig | 90 |
1 files changed, 27 insertions, 63 deletions
diff --git a/lib/std/math.zig b/lib/std/math.zig index 6d5faeb7ee..558629b743 100644 --- a/lib/std/math.zig +++ b/lib/std/math.zig @@ -47,6 +47,8 @@ pub const floatMin = @import("math/float.zig").floatMin; pub const floatMax = @import("math/float.zig").floatMax; pub const floatEps = @import("math/float.zig").floatEps; pub const inf = @import("math/float.zig").inf; +pub const nan = @import("math/float.zig").nan; +pub const snan = @import("math/float.zig").snan; pub const f16_true_min = @compileError("Deprecated: use `floatTrueMin(f16)` instead"); pub const f32_true_min = @compileError("Deprecated: use `floatTrueMin(f32)` instead"); @@ -73,47 +75,38 @@ pub const f32_toint = @compileError("Deprecated: use `1.0 / floatEps(f32)` inste pub const f64_toint = @compileError("Deprecated: use `1.0 / floatEps(f64)` instead"); pub const f80_toint = @compileError("Deprecated: use `1.0 / floatEps(f80)` instead"); pub const f128_toint = @compileError("Deprecated: use `1.0 / floatEps(f128)` instead"); -pub const inf_u16 = @compileError("Deprecated: use `@bitCast(u16, inf(f16))` instead"); +pub const inf_u16 = @compileError("Deprecated: use `@as(u16, @bitCast(inf(f16)))` instead"); pub const inf_f16 = @compileError("Deprecated: use `inf(f16)` instead"); -pub const inf_u32 = @compileError("Deprecated: use `@bitCast(u32, inf(f32))` instead"); +pub const inf_u32 = @compileError("Deprecated: use `@as(u32, @bitCast(inf(f32)))` instead"); pub const inf_f32 = @compileError("Deprecated: use `inf(f32)` instead"); -pub const inf_u64 = @compileError("Deprecated: use `@bitCast(u64, inf(f64))` instead"); +pub const inf_u64 = @compileError("Deprecated: use `@as(u64, @bitCast(inf(f64)))` instead"); pub const inf_f64 = @compileError("Deprecated: use `inf(f64)` instead"); +pub const inf_u80 = @compileError("Deprecated: use `@as(u80, @bitCast(inf(f80)))` instead"); pub const inf_f80 = @compileError("Deprecated: use `inf(f80)` instead"); -pub const inf_u128 = @compileError("Deprecated: use `@bitCast(u128, inf(f128))` instead"); +pub const inf_u128 = @compileError("Deprecated: use `@as(u128, @bitCast(inf(f128)))` instead"); pub const inf_f128 = @compileError("Deprecated: use `inf(f128)` instead"); +pub const nan_u16 = @compileError("Deprecated: use `@as(u16, @bitCast(nan(f16)))` instead"); +pub const nan_f16 = @compileError("Deprecated: use `nan(f16)` instead"); +pub const nan_u32 = @compileError("Deprecated: use `@as(u32, @bitCast(nan(f32)))` instead"); +pub const nan_f32 = @compileError("Deprecated: use `nan(f32)` instead"); +pub const nan_u64 = @compileError("Deprecated: use `@as(u64, @bitCast(nan(f64)))` instead"); +pub const nan_f64 = @compileError("Deprecated: use `nan(f64)` instead"); +pub const nan_u80 = @compileError("Deprecated: use `@as(u80, @bitCast(nan(f80)))` instead"); +pub const nan_f80 = @compileError("Deprecated: use `nan(f80)` instead"); +pub const nan_u128 = @compileError("Deprecated: use `@as(u128, @bitCast(nan(f128)))` instead"); +pub const nan_f128 = @compileError("Deprecated: use `nan(f128)` instead"); +pub const qnan_u16 = @compileError("Deprecated: use `@as(u16, @bitCast(nan(f16)))` instead"); +pub const qnan_f16 = @compileError("Deprecated: use `nan(f16)` instead"); +pub const qnan_u32 = @compileError("Deprecated: use `@as(u32, @bitCast(nan(f32)))` instead"); +pub const qnan_f32 = @compileError("Deprecated: use `nan(f32)` instead"); +pub const qnan_u64 = @compileError("Deprecated: use `@as(u64, @bitCast(nan(f64)))` instead"); +pub const qnan_f64 = @compileError("Deprecated: use `nan(f64)` instead"); +pub const qnan_u80 = @compileError("Deprecated: use `@as(u80, @bitCast(nan(f80)))` instead"); +pub const qnan_f80 = @compileError("Deprecated: use `nan(f80)` instead"); +pub const qnan_u128 = @compileError("Deprecated: use `@as(u128, @bitCast(nan(f128)))` instead"); +pub const qnan_f128 = @compileError("Deprecated: use `nan(f128)` instead"); pub const epsilon = @compileError("Deprecated: use `floatEps` instead"); -pub const nan_u16 = @as(u16, 0x7C01); -pub const nan_f16 = @as(f16, @bitCast(nan_u16)); - -pub const qnan_u16 = @as(u16, 0x7E00); -pub const qnan_f16 = @as(f16, @bitCast(qnan_u16)); - -pub const nan_u32 = @as(u32, 0x7F800001); -pub const nan_f32 = @as(f32, @bitCast(nan_u32)); - -pub const qnan_u32 = @as(u32, 0x7FC00000); -pub const qnan_f32 = @as(f32, @bitCast(qnan_u32)); - -pub const nan_u64 = @as(u64, 0x7FF << 52) | 1; -pub const nan_f64 = @as(f64, @bitCast(nan_u64)); - -pub const qnan_u64 = @as(u64, 0x7ff8000000000000); -pub const qnan_f64 = @as(f64, @bitCast(qnan_u64)); - -pub const nan_f80 = make_f80(F80{ .fraction = 0xA000000000000000, .exp = 0x7fff }); -pub const qnan_f80 = make_f80(F80{ .fraction = 0xC000000000000000, .exp = 0x7fff }); - -pub const nan_u128 = @as(u128, 0x7fff0000000000000000000000000001); -pub const nan_f128 = @as(f128, @bitCast(nan_u128)); - -pub const qnan_u128 = @as(u128, 0x7fff8000000000000000000000000000); -pub const qnan_f128 = @as(f128, @bitCast(qnan_u128)); - -pub const nan = @import("math/nan.zig").nan; -pub const snan = @import("math/nan.zig").snan; - /// Performs an approximate comparison of two floating point values `x` and `y`. /// Returns true if the absolute difference between them is less or equal than /// the specified tolerance. @@ -336,37 +329,8 @@ test { _ = floatMax; _ = floatEps; _ = inf; - - _ = nan_u16; - _ = nan_f16; - - _ = qnan_u16; - _ = qnan_f16; - - _ = nan_u32; - _ = nan_f32; - - _ = qnan_u32; - _ = qnan_f32; - - _ = nan_u64; - _ = nan_f64; - - _ = qnan_u64; - _ = qnan_f64; - - _ = nan_f80; - _ = qnan_f80; - - _ = nan_u128; - _ = nan_f128; - - _ = qnan_u128; - _ = qnan_f128; - _ = nan; _ = snan; - _ = isNan; _ = isSignalNan; _ = frexp; |
