aboutsummaryrefslogtreecommitdiff
path: root/std/math
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2017-09-28 08:48:19 -0400
committerGitHub <noreply@github.com>2017-09-28 08:48:19 -0400
commit0cfeefbf158e91922e367113c438c331d75ac1b4 (patch)
tree205d5ac64bf5f7a896fdd576a3e284b06b6cf714 /std/math
parentfd5a5db400995d80015448d19e92daaca71a7f72 (diff)
parent9dfe217be38289b0c9e662d1a0e7c0231bf42a7d (diff)
downloadzig-0cfeefbf158e91922e367113c438c331d75ac1b4.tar.gz
zig-0cfeefbf158e91922e367113c438c331d75ac1b4.zip
Merge pull request #502 from zig-lang/f128-literals
Allow 128-bit hex float literals
Diffstat (limited to 'std/math')
-rw-r--r--std/math/expm1.zig2
-rw-r--r--std/math/scalbn.zig4
2 files changed, 3 insertions, 3 deletions
diff --git a/std/math/expm1.zig b/std/math/expm1.zig
index 5ee28e7866..ef0b2766b1 100644
--- a/std/math/expm1.zig
+++ b/std/math/expm1.zig
@@ -255,7 +255,7 @@ fn expm1_64(x_: f64) -> f64 {
if (k < 0 or k > 56) {
var y = x - e + 1.0;
if (k == 1024) {
- y = y * 2.0 * 0x1.0p1022 * 10;
+ y = y * 2.0 * 0x1.0p1023;
} else {
y = y * twopk;
}
diff --git a/std/math/scalbn.zig b/std/math/scalbn.zig
index bb1e208b9e..6e82194494 100644
--- a/std/math/scalbn.zig
+++ b/std/math/scalbn.zig
@@ -45,10 +45,10 @@ fn scalbn64(x: f64, n_: i32) -> f64 {
var n = n_;
if (n > 1023) {
- y *= 0x1.0p1022 * 2.0;
+ y *= 0x1.0p1023;
n -= 1023;
if (n > 1023) {
- y *= 0x1.0p1022 * 2.0;
+ y *= 0x1.0p1023;
n -= 1023;
if (n > 1023) {
n = 1023;